Car Wash: improvements