fix pasteCatcher logic, improved imgdiff behavior