Javadoc, small fixes, etc.