mostly comment/cleanups (but a few other minor changes)