Javadoc and some mistakes fixed