Correction and style fixes