cleanup in Cmake and updated readme.