Spells and some engine edits to ease them