fingers-crossed: final refinements and tweaks