Adressing issues by adamv

I've removed the remarks and cleaned up the cmakelists.txt file creation.