Fixed duplicate events in event system

hacked for the time being - need to locate the source of duplicates
rather than simply preventing them.