* fix initialization 
* support for flight leg