Pushing a bunch of small changes, mostly from Vincent.