Documentation and Javadoc polishing and minor enhancement

See commit messages.