Javadoc additions; minor cleanup