SLING-3709, extend javadocs, some cleanup