Added in the new wildcard URL feature plus a few other fixes/features