Tweak and polish