Improve cmake files and update README