Various fixes

This should clean up 
https://github.com/nickdenardis/wild-wayne/issues/31
https://github.com/nickdenardis/wild-wayne/issues/30
https://github.com/nickdenardis/wild-wayne/issues/29

we'll need to rebuild  the box for all 3