add support for canceled / additional stops. untested at the moment