tidy up and fixes
Merge pull request #46 from SGover/master

tidy up and fixes