Fixed annotations & added some nice methods to the Trip and TripDAO