little tidying & debugging after collab session
(details to follow in subsequent commit message)
(details to follow in subsequent commit message)
Merge pull request #41 from braithwaite/master

merge features / patches