minor changes to Event module