API improvements and Javadoc