Added javadoc info, and maybe some things I forgot