Fixed typo in Trip initiailizer
fix flxibility bug, clean it up a little
resolve merge conflict related to 'convert_to_date' function