bunch of misc changes