a few minor cleanups, renamings, javadoc additions