version and style fixes