Allow overlapping matches, fix minor bug in checking rop