Final Final Commit

Had to add a few more javadocs, done now.