Merge pull request #53 from kannibalox/master

A bunch of minor fixes and changes