Refactored event parsers, fixed update behaviour.