Improvements to Javadocs