Added fixes for anyURI and some lingering bugs.