Minor changes and Javadoc