Final commit. Various cleanup and extra comments. Removed a bunch of commented out code