A few edits from JCP up to sec. 2.1.  May be all I can get to before the weekend.
Merge github.com:david-deboer/msip-2014