lots of misc changes