some fixed and cleanup of wildcards