javadoc tweaking and some warning fix