Added more event listeners

Yeah this is the lazy way of doing it