cleanup fuzzy matching
fix unite commands