Some improvments for the tutorial