Fixed a lot of data management bugs in the re-keying and matching hoops