Javadocs, and several simplifications.