Fix bug with uncleary matches and add some docs