Done(?) with Neta's comments through ch3