Added a bit of javadocs