tutorial changes, other minor thangs
merge