fix errors with undo and match count
plural vs unplural