You can also swap spells out between combat so I think some things still need to be adjusted on that front.