Improvements and Javadoc