Generalized ride-sharing: An enhanced model and new results