Added some javadoc stuff