small improvements and javadoc