Fix tau on p21, formulas on pp41,44