Spot controller improvements
Fix block quotes
Merge branch 'dev'