misc changes, lots of