Minor bug fixes highlighted by Adam
Merge pull request #9 from AntoniaR/master

Minor bug fixes highlighted by Adam