Further tutorial improvements