Misc tweaks, comments.
4 files changed