Events have comments too

Fixing to have events work too