Minor updates
Wildcards shouldn't match empty tokens.