Minor improvements to tut