Javadoc and other edits