generated javadoc and some minority corrections