Remove some javadoc errors; make others more pronounced ;-) (#1266)