fix bikes: using SaverExtras, any number of bikes for same booking possible, added 'pickup on arrival'