fix bugs and add pickup car flow