More OPL IV retagging, and some problem polishing