Improved NCForm and fixed CMakeLists