javadoc everywhere and some small modifications