@dzucconi: Grab bag of bugs/polish

![image](https://cloud.githubusercontent.com/assets/555859/4957998/ecafea6e-66a9-11e4-9321-be1b0e2a8afe.png)