javadoc fixes, format, and commented code removed