Updated Javadocs, touchups.