Fixes for Bus and proper play alternation in UI
Also cleaned up approach to steps in tutorial