event_fixes - state one
lots of fixes - see post for changelog