Tutorial specific options can now be specified
Minor edits