Tutorial improved (and finished)