fixed some errors, still working on trip id bug