Updated cmake files, minor tweaks