Changed data to trips and temp

some formatting changes