Add comments to Trip, and change some methods return types.