diff --git a/otto.sh b/otto.sh
index 7bb26c3..465befc 100755
--- a/otto.sh
+++ b/otto.sh
@@ -3,7 +3,7 @@
 # Date: 2024
 # Filename: otto.sh
 
-CROSS_TC_WIN="$(pwd)/i686-w64-mingw32_toolchain.cmake"
+WCH_TC="$(pwd)/riscv32-toolchain.cmake"
 CMAKE_VERBOSE="ON"
 CROSS_COMPILE=1
 TEMPLATE_FILES=".template_files"
@@ -176,14 +176,16 @@ cross_compile () {
 }
 
 build_release() {
-    clear_cmake_cache 
-    cmake -DCAM_HANDLER_LIB=ON -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE} ../ 
-    make 
+    clear_cmake_cache
+    CMAKE_ARGS="-DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE}"
+    CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${WCH_TC}"
+
+    cmake ${CMAKE_ARGS} ../ 
+    make main
 }
 
 build_main () {
     clear_cmake_cache
-    
     cmake -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE} ../
     make main
 }
@@ -192,7 +194,7 @@ run_c_tests () {
     format_source_code 
     clear_cmake_cache
     cmake -DUNIT_TESTING=ON  -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE} ../
-    make AllTests && ./tests/AllTests
+    make AllTests && ./tests/AllTests -c -v
 }
 
 print_menu () {