Cleanups
Trip id is returned on row insert
Some cleanups
Minor changes