Got wildcards working, fixed a few issues