few fixes
Merge pull request #3 from calvinmetcalf/master

few fixes