tweaks: rename, rewrap, and reshuffle some stuff, and frob some comments
5 files changed