Cleaned up some junk and tried to remove some spurious warnings.  Oh and the cmakelists file finally