Tour Bug Fixes: 310, 309, 308.

Code Review: http://mrccodereview.cloudapp.net/ui#review:id=1146

Fixing #310, #309, #308. (Tour ship-blocker bugs).