Various small improvements.