Priority/5.4 mage fire priority list

Fixed issue 12 and 13 now, I think. This branch is acting strange.