big batch of tweaks