reparse speedup, messages desync fix