Proof reading and fixes