a couple of small improvements