FIX: Incorrect calculation of estimated arrival and departure times (Philip)