More changes, some javadocs