Fixes
Merge pull request #29 from rmcgibbo/assorted

Fixes