Additional functions and Javadoc update.