Small tweaks from suggestions from the team. Thx team!