Fixed method naming and bug in pick_up and drop_off functionality