Various fixes

This follows reviews that happened this morning.

/cc @jamesgorrie @kungpochicken @ironsidevsquincy 

![nasty-taste](https://cloud.githubusercontent.com/assets/85783/3053136/838d14b0-e1a4-11e3-85f3-44f3f1780b59.gif)