javadoc + housekeeping