newTrip fix
Some improvements again