...
javadoc warning cleanup
comments