Improve event handling, bump copyright