Added and updated Javadocs