commenting and making minor changes as I go through the source. No
functional changes.