Code review

Hi Will.  Here is the code review (at last).  Sorry for the big delay.  I usually do these much faster.  I feel there is a bunch more that could be done, but thought I'd stop here: 40 commits is enough for anyone to swallow.