Few cleanups, added cmake settings, bug fixes