+cmake
+minor fixes