minor changes with event handlers