Finished comments for javadocs
Made a few minor code changes here and there