Javadoc and some other changes