more javadoc stuff, code cleansing, and some IO tweaks