updated help string
more fixes
oops
Merge pull request #17 from b0nk/master

More fixes