Updating Javadoc and minor interface changes