Some aesthetic improvements.