Minor bugfixes
Re-implemented all state spells