Slew of tweaks.