More fixy
Merge pull request #26 from theodi/Phil-edits

More fixy