Fix javadoc and userguide