Last javadoc comments and some minor fixes