Event comments

Fixed event comments from #51