Fixes regarding latest commits and changes.
Travel terms logic alteration.