Half of the changes to tutorial

will finish later