Various mainly stylistic improvements.