Cleaned up, added dvorm stuff.