Review 220-256

various odd'n'sods tagged
Merge pull request #33 from kinglouisxiv/patch-4

Review 220-256