refinements, fixes, upgrades...