Javadoc improvements, minor changes