added notifications
Fixed escape bug
refactor matchers