Updated some comments
Added code to test of EventMaker