fixed tools handling events they shouldn't have been accepting