fix refactoring bug + tutorial updates