more fixes to distribution per suggestion of Da