Final tweaks from Ethan