Death + Mana consume bug + New wave controller