@dzucconi: Random bugs & QA

![image](https://cloud.githubusercontent.com/assets/555859/5519838/e5de6ad4-8932-11e4-8b36-51547219f778.png)