Added return to all event handlers. Some were missed. #227