some fixes
Merge pull request #1 from matthewfl/master

some fixes