Logic fixes

must....match......PQR