Fixed bug in event_generator, added method to return modified points based on current event