Proof reading and testing fixes