updates to the parser, some conditions and a mage rotation