some additional comments and minor changes.
See Diff for more details