Javadoc changes and minor code updates