fixes
changes
Merge pull request #58 from Olly-/master

lots of odd things.