Committing jira fixes + event simulator improvements