tweaks from last night to tidy up: