working on tutorial fixes/transition