last batch of tweaks