Lots of misc updates. Should have been several checkins over a period of a couple weeks, but I've been lazy.