Mostly javadoc improvements. A few minor api tweaks as well.