Lots of fixes for tutorial 1