Final tweaks and trials