couple of event handler bug fixes
2 files changed