tweaks: frob some comments and rename a few variables and a function
3 files changed