Bugfix/improvement arrival map generation