A couple of visual improvements