and here are the rest of the fixes.
Merge pull request #33 from tejaycar/master

and here are the rest of the fixes.