Add more events and fix up message syntax