mopping up some minor changes/typos