wildcard support and other fixes