Properly match namespaces/wildcards
Fixed some typos and minor improvements
Make names appear