Javadoc additions and cleaning up.