More updates to tutorial
Merged tutorial