tweaks and tidy-ups