~ various sharing improvements