QA

Rolling QA fixes and refinements. Will ping once ready for review.
![](http://media.giphy.com/media/5xtDarFjJmU0GbobWo0/giphy.gif)