minor architecture changes, Spell::getArea fix