Corrections and improvements from review