More changes, lots of javadoc.