A slew of tweaks