some proof-reading and improvements