I couldn't help myself
now works
Merge pull request #39 from calvinmetcalf/fixing

a few touch ups