event_model some fixes