improved the parsing a bit (separate emitters), but ending too many times.