Updated Javadocs and readme.md