tidy-up and tweaks