Fixed a few bugs with the merge, added I18n to spells