implemented changes to tutorial one + started working on bugfix