Final tweaks from me