more manual matches (missed a couple)