changed transport trigger from stopping to ending
update
added handlers comments