add in Event Comparator and fixed minor bugs