Javadoc and other updates