tutorial updates

fixes #772 and several other clean-ups.