Merge pull request #1 from chaosagent/master

A few minor changes...
More fixes/things

misc stuffs