Javadoc and API improvements