More javadocs, some minor fixes.