diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..638c8d2a4f126823299db9c14b149df08d613908
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+bin
+build
+lib
diff --git a/Findfirewire.cmake b/Findfirewire.cmake
index cd16e981b5e89f006f46bead97add93ce169c437..e1a8caa50d83a8c95d1ec0592d4735be107be3ab 100644
--- a/Findfirewire.cmake
+++ b/Findfirewire.cmake
@@ -1,8 +1,11 @@
-FIND_PATH(firewire_INCLUDE_DIR firewirecamera.h firewireserver.h firewireexceptions.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(firewire_INCLUDE_DIR firewirecamera.h firewireserver.h firewireexceptions.h /usr/include/iri/firewire /usr/local/include/iri/firewire)
 
 FIND_LIBRARY(firewire_LIBRARY
     NAMES firewire
-    PATHS /usr/lib/iridrivers /usr/local/lib /usr/local/lib/iridrivers) 
+    PATHS /usr/lib/iri/firewire /usr/local/lib /usr/local/lib/iri/firewire)
+    
+SET(firewire_INCLUDE_DIRS ${firewire_INCLUDE_DIR})
+SET(firewire_LIBRARIES    ${firewire_LIBRARY})
 
 IF (firewire_INCLUDE_DIR AND firewire_LIBRARY)
    SET(firewire_FOUND TRUE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 28eed989be75e15a3538ccd838b5a947e223caa9..90974a829c6e1983b1c4ea3f55e3ddea950ff73c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,11 +54,11 @@ IF (firewire_ready)
 
    INSTALL(TARGETS firewire
       RUNTIME DESTINATION bin
-      LIBRARY DESTINATION lib/iridrivers
-      ARCHIVE DESTINATION lib/iridrivers
+      LIBRARY DESTINATION lib/iri/${PROJECT_NAME}
+      ARCHIVE DESTINATION lib/iri/${PROJECT_NAME}
    )
 
-   INSTALL(FILES ${headers} DESTINATION include/iridrivers)
+   INSTALL(FILES ${headers} DESTINATION include/iri/${PROJECT_NAME})
 
    INSTALL(FILES ../Findfirewire.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
 
diff --git a/src/firewirecamera.cpp b/src/firewirecamera.cpp
index a399a1cdb954507ba0209a2fa6f0f897e2b138f3..e5441f1db93faca8f47b4639e3bcc513df7f2335 100644
--- a/src/firewirecamera.cpp
+++ b/src/firewirecamera.cpp
@@ -217,6 +217,7 @@ void CFirewireCamera::set_mode(unsigned int left_off, unsigned int top_off,unsig
   for ( i = 0 ; i < supported_video_modes.num ; i++)
     if ( supported_video_modes.modes[i] == mode )
     {
+      //std::cout << "video mode " << supported_video_modes.modes[i] << std::endl;
       error = dc1394_video_set_mode(this->camera_handle,mode);
       if ( error != DC1394_SUCCESS )
       {