Fixing ups
Merge pull request #1 from bmneely/fixups

Fixing ups