Update all code and tutorial tweaks
Improving tutorial