more cleanups, javadocs, visibitliy changes etc.