v0.34 #9
Mostly javadoc
v0.34 #10-11