Javadoc updated and added to missing parts of code