Added more event handlers

A few errors but have to go to the doctors now :(