Cleaned up code + added _event
Code was a bit messy, now structured into common,sourcedict,identifier sections
_event sourcedict flags are for event-based data