diff --git a/Sources/src/Visnode/CMakeLists.txt b/Sources/src/Visnode/CMakeLists.txt
index 6c04341..6c07026 100644
--- a/Sources/src/Visnode/CMakeLists.txt
+++ b/Sources/src/Visnode/CMakeLists.txt
@@ -8,6 +8,8 @@ project(visnode)
 #set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/../bin)
 set(CMAKE_BINARY_DIR /home/kanken/code/project-/Sources/src/Visnode/)
 find_package(OpenCV REQUIRED)
+find_package(TBB REQUIRED)
+
 
 #SET("OpenCV_DIR" "/usr/local/lib/")
 include_directories(${OpenCV_INCLUDE_DIRS} )
@@ -30,7 +32,7 @@ add_executable(prog ${main_source_files})
 
 MESSAGE(STATUS "CMAKE FLAGS : ${LINK_OPTIONS}")
 
-target_link_libraries(prog hw)
+target_link_libraries(prog hw tbb)
 
 SET(GCC_COVERAGE_COMPILE_FLAGS "-L/usr/local/lib")
 add_definitions(${GCC_COVERAGE_COMPILE_FLAGS})
\ No newline at end of file
diff --git a/Sources/src/Visnode/cameras/CMakeLists.txt b/Sources/src/Visnode/cameras/CMakeLists.txt
index 3dce9f6..2dcac43 100644
--- a/Sources/src/Visnode/cameras/CMakeLists.txt
+++ b/Sources/src/Visnode/cameras/CMakeLists.txt
@@ -13,6 +13,6 @@ MESSAGE(STATUS "Opencv_LINK_DIRS : ${Opencv_LINK_DIRS}")
 
 find_package( OpenCV REQUIRED )
 
-target_link_libraries(cameras OpenCV)
+target_link_libraries(cameras ${OpenCV_LIBS})
 target_link_libraries(cameras threadweaver)
 MESSAGE(STATUS "Done building cameras")
\ No newline at end of file
diff --git a/Sources/src/Visnode/cameras/_cam.hpp b/Sources/src/Visnode/cameras/_cam.hpp
index 3e77f72..1d417bf 100644
--- a/Sources/src/Visnode/cameras/_cam.hpp
+++ b/Sources/src/Visnode/cameras/_cam.hpp
@@ -12,7 +12,7 @@
 #include <thread>
 #include <mutex> 
 #include <chrono>
-#include <opencv4/opencv2/opencv.hpp>
+#include <opencv2/opencv.hpp>
 #include "../threadweaver/threadweaver.hpp"
 
 #define DEBUG_ELAPSED_START std::chrono::steady_clock::time_point bgd = std::chrono::steady_clock::now();
diff --git a/Sources/src/Visnode/ihidapi/CMakeLists.txt b/Sources/src/Visnode/ihidapi/CMakeLists.txt
index 6a81815..d37109f 100644
--- a/Sources/src/Visnode/ihidapi/CMakeLists.txt
+++ b/Sources/src/Visnode/ihidapi/CMakeLists.txt
@@ -3,10 +3,10 @@ set(ihidapi_source_files
     _hidapi.hpp
 )
 MESSAGE(STATUS "Building ihidapi")
-add_library(ihiadpi ${ihidapi_source_files})
+add_library(ihidapi ${ihidapi_source_files})
 
 find_package(hidapi REQUIRED)
 
-target_link_libraries(ihiadpi hidapi::hidapi)
+target_link_libraries(ihidapi PRIVATE hidapi::hidapi)
 
 MESSAGE(STATUS "Done building ihidapi")
\ No newline at end of file
diff --git a/Sources/src/Visnode/prog b/Sources/src/Visnode/prog
index 9c379b4..c21169f 100755
Binary files a/Sources/src/Visnode/prog and b/Sources/src/Visnode/prog differ
diff --git a/Sources/src/Visnode/psvr/CMakeLists.txt b/Sources/src/Visnode/psvr/CMakeLists.txt
index 47841ef..f87cf9c 100644
--- a/Sources/src/Visnode/psvr/CMakeLists.txt
+++ b/Sources/src/Visnode/psvr/CMakeLists.txt
@@ -5,6 +5,6 @@ set(psvr_source_files
 MESSAGE(STATUS "building psvr")
 add_library(psvr ${psvr_source_files})
 
-target_link_libraries(cameras ihidapi)
+target_link_libraries(psvr ihidapi)
 
 MESSAGE(STATUS "Done building psvr")
\ No newline at end of file
diff --git a/Sources/src/Visnode/ui/CMakeLists.txt b/Sources/src/Visnode/ui/CMakeLists.txt
index 669254f..9cfda5e 100644
--- a/Sources/src/Visnode/ui/CMakeLists.txt
+++ b/Sources/src/Visnode/ui/CMakeLists.txt
@@ -17,7 +17,7 @@ MESSAGE(STATUS "Opencv_LINK_DIRS : ${Opencv_LINK_DIRS}")
 
 add_library(ui ${ui_source_files})
 
-target_link_libraries(ui Opencv)
+target_link_libraries(ui ${OpenCV_LIBS})
 target_link_libraries(ui psvr)
 target_link_libraries(ui cameras)
 
diff --git a/Sources/src/Visnode/ui/_ui.hpp b/Sources/src/Visnode/ui/_ui.hpp
index 27e5984..73a1082 100644
--- a/Sources/src/Visnode/ui/_ui.hpp
+++ b/Sources/src/Visnode/ui/_ui.hpp
@@ -7,7 +7,7 @@
 
 #include "../cameras/_cam.hpp"
 #include "../psvr/_psvr.hpp"
-#include <opencv4/opencv2/imgcodecs/imgcodecs.hpp>
+#include <opencv2/imgcodecs/imgcodecs.hpp>
 
 #define DEFAULT_UI_WINDOW_AMOUNT 2  //2 windows, one for each eye
 #define DEFAULT_UI_OFFSET_X 0    //1080