a couple of small fixes
Merge pull request #80 from kraftery/kieran2

a couple of small fixes