Lots of small improvements.