Final tweaks

Got there in the end