Lots of misc changes