A few minor changes. Prevent the actual nb of cars from being set to zero.