Changed javadoc and other small things