[tut/chap2] misc adjustments