fixing a handful of issues
Merge pull request #2498 from awesomerobot/master

fixing a handful of issues