Lots of misc changes.