fix event cleanup
reimplement option trigger that could prevent routes from being actually executed
fix routing