diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index d4865c8..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gitignore b/.gitignore
index 6bdbce9..2fc7002 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,4 +56,8 @@ tags
 
 _site
 .jekyll-cache
-vendor
\ No newline at end of file
+vendor
+
+**/.DS_Store
+.vscode/
+.history/
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
index 7326e0f..470b808 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,6 +1,8 @@
 title: Zephyr Tutorial
 remote_theme: bedroesb/just-the-docs
 
+# baseurl: "/zephyr-rtos-tutorial"
+
 plugins:
   - jekyll-relative-links
   - jekyll-remote-theme
diff --git a/docs/.DS_Store b/docs/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/docs/.DS_Store and /dev/null differ
diff --git a/docs/1-zephyr-setup/install/mac-os.md b/docs/1-zephyr-setup/install/mac-os.md
index 64a690f..d37562d 100644
--- a/docs/1-zephyr-setup/install/mac-os.md
+++ b/docs/1-zephyr-setup/install/mac-os.md
@@ -119,5 +119,5 @@ A successful flash looks like this:
 
 {: .warning}
 > Some boards will require installing an additional `pyocd` package! 
-> ![pyocd-error](../../../images/zephyr-setup/pyocd-error.png)
+> ![pyocd-error](/../images/zephyr-setup/pyocd-error.png)
 > For Nucleo L552ZE-Q: `pyocd pack install stm32l552zetxq` (see [pyocd/target_support](https://pyocd.io/docs/target_support.html#managed-packs))
\ No newline at end of file
diff --git a/docs/1-zephyr-setup/setup/mac-os.md b/docs/1-zephyr-setup/setup/mac-os.md
index 68ac2c8..080193d 100644
--- a/docs/1-zephyr-setup/setup/mac-os.md
+++ b/docs/1-zephyr-setup/setup/mac-os.md
@@ -60,6 +60,7 @@ west flash
 
 {: .note }
 > If you've previously made a build for a different board, remove the old build first: `rm -rf build`
+> For convenience, full path to the basic-sample page: `cd ~/zephyrproject/zephyr-rtos-tutorial/exercises/basic-sample`
 
 - Verify the serial output:
 
diff --git a/docs/2-introduction/rtos-basics.md b/docs/2-introduction/rtos-basics.md
index 3f50c00..fcdbe8b 100644
--- a/docs/2-introduction/rtos-basics.md
+++ b/docs/2-introduction/rtos-basics.md
@@ -28,4 +28,4 @@ Each **thread** (or task) will use registers and memory as it executes. The whol
 
 Along with threads, you'll be using primitives such as **queues**, **mutexes** and **semaphores** for inter-thread communication. Then each RTOS provides varying levels of support for different protocols such as **TCP/IP**, **Bluetooth**, **LoRaWan**,... This makes your life easier, since now you don't need to study these protocols as in-depth. You'll get a series of API calls which should increase speed of development.
 
-![rtos-basic-execution](../../images/2-introduction/rtos_basic_execution.gif)
\ No newline at end of file
+![rtos-basic-execution](/images/2-introduction/rtos_basic_execution.gif)
\ No newline at end of file
diff --git a/docs/_includes/incomplete.md b/docs/_includes/incomplete.md
new file mode 100644
index 0000000..5dfc488
--- /dev/null
+++ b/docs/_includes/incomplete.md
@@ -0,0 +1,2 @@
+{: .warning}
+This section is incomplete. You can help by [contributing](https://github.com/maksimdrachov/zephyr-rtos-tutorial).
\ No newline at end of file
diff --git a/exercises/basic-sample/src/main.c b/exercises/basic-sample/src/main.c
index 3772c6f..b585855 100644
--- a/exercises/basic-sample/src/main.c
+++ b/exercises/basic-sample/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
 
diff --git a/images/.DS_Store b/images/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/images/.DS_Store and /dev/null differ