added first_name and last_name fields, reformatted trips/new