many misc tweaks, hopefully nothing breaks