Fixes
Merge pull request #4 from GrahamForks/fixes

Simplified a few things