Add a comment todo for events
remove extra comma