Final commit, comments finalized, javadocs added