some basic quick fixes/changes to make more robust
Merge pull request #1 from ethanspitz/master

some basic quick fixes/changes to make more robust