Lots of minor improvements.