Cleaned up some code
Cleaned up the project
Minor bug fixes