editing of trips and other bugfixes