changes to Cmakelists and init