Fixup container start event parsing, add comments