Making configuration options consistent with preprocessor options
fixing Cmake
changes to Cmakelists and init