moar mage bug fixes
Merge pull request #183 from Align/Graham-march-26-2

moar mage bug fixes