Fix 0.6.0-M1 javadoc generation, and some docs tidying