remaining tweaks; untested, of course…