(#a lot) small bugs

https://www.pivotaltracker.com/story/show/66977750
https://www.pivotaltracker.com/story/show/66801510
https://www.pivotaltracker.com/story/show/66800698