better C-p matching, more unite configuration