SPV small improvements

top: develop
bottom: this PR
![spv-small-improvements](https://f.cloud.github.com/assets/3798614/2041273/7f9e9e98-89c3-11e3-9367-01ee72b5b6ba.png)