I'm glad the final product turned out good for you. I really appreciated your feedback.
And I really thought I fixed all the inconsistent names, but I guess mage/witch slipped past me