@dzucconi: Adding captions & more random polish/bug items

![cap](https://cloud.githubusercontent.com/assets/555859/4962385/8ece05ea-66de-11e4-8f00-20ae73eb2a85.gif)

![image](https://cloud.githubusercontent.com/assets/555859/4962386/94764be2-66de-11e4-9a4b-5d10a8503c0e.png)