lots of misc tweaks