Attempt to correct all these tiny programming errors I made.
Also put in the changes CMakeList.txt