More tweaks from Wyatt