Aesthetic improvements, mostly suggested by Gareth.