Several minor aesthetic improvements