fixed bugs in One-Way
Implemented Round-Trip