Styling and timing tweaks