start fixing moving bugs
Updates will fall back to creates
Merge branch 'fix_event_errors'