quick maybe fix of eventRenderer og commenteringes
Fixed merge conflict