Various fixes for tutorial
bug #562 Various fixes for tutorial (dantleech)

This PR was submitted for the dev branch but it was merged into the master branch instead (closes #562).

Discussion
----------

Various fixes for tutorial

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all (or 2.3+)
| Fixed tickets | #559

Commits
-------

775d2ec Various fixes for tutorial