bunch of tweaks