Merged some changes that SCott made to event_manager
2 files changed