Tutorial fixes

Closes #219