some iterative design changes
Merge pull request #2117 from awesomerobot/master

some iterative design changes