Adding mana updates and fixes