More upgrade docs, minor fixes in a couple of places.