Bugmash

fixes for
- #164 
- #209 
- #205 (this is up for discussion)