Updated mage model, let me know if you find any errors w/ the new mage