Added a few more events, and move all events to bottom of handler class