diff --git a/data/campaigns/Sceptre_of_Fire/maps/1_A_Bargain_is_Struck.map b/data/campaigns/Sceptre_of_Fire/maps/1_A_Bargain_is_Struck.map
index 744ace369fea..ce15dd95223a 100644
--- a/data/campaigns/Sceptre_of_Fire/maps/1_A_Bargain_is_Struck.map
+++ b/data/campaigns/Sceptre_of_Fire/maps/1_A_Bargain_is_Struck.map
@@ -1,33 +1,34 @@
-Ms, Ms, Ha, Ms, Ha, Ha, Ha, Ms, Ms, Ms, Ha, Ms, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms, Ms^Xm, Ms^Xm, Ms, Ms, Ms, Ms, Ms^Xm, Ms^Xm, Ms^Xm, Cfa, Ms, Aa^Fpa, Rr, Rr, Ms, Ms
-Ha, Ms, Ha, Ms, Ai, Ai, Ha, Ms, Ms, Ms, Ha, Ms, Ms, Ms, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms^Xm, Ms, Ms, Ms, Ms, Ms^Xm, Ms^Xm, Ms, Ha^Vhha, Rr, Rr, Ms, Cfa, Cfa, Ms
-Aa, Aa, Aa, Ha, Ai, Ai, Aa, Aa, Ha, Ha, Ai, Ha, Ha, Ha, Ms, Ms^Xm, Ms^Xm, Ms^Xm, Ms, Ms, Ms, Ms, Ha, Ms, Ms, Ms, Cfa^Ebn, Ms, Rr, Ms, Ms, Ms, Ms^Xm, Cfa
-Ha^Fpa, Ha, Aa, Aa, Aa, Ai, Aa^Esa, Aa, Aa, Ai, Ai, Ha, Ha^Vhha, Ms, Ms, Ms, Ms, Ms^Xm, Ms, Ms, Ha, Ha^Vhha, Aa, Ha, Ha, Ms, Ha, Ha, Rr, Ha, Ms, Ms, Ms^Xm, Ms^Xm
-Ha^Fpa, Ha^Fpa, Ha, Aa^Fpa, Aa, Aa, Gd^Esa, Rd, Rd, Rd, Rd, Ha, Aa, Ha, Ha, Ms, Ms, Ms, Ms, Ha, Ha, Rd, Rd, Aa, Ha^Fpa, Ha, Rr, Rr, Ha, Ha, Cfa^Ebn, Ms, Ww, Ms^Xm
-Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha, Cva, Rd, Aa, Rd, Gd^Esa, Aa, Gd^Esa, Ai, Ai, Ha, Ms, Ha, Rd, Rd, Rd, Rd, Aa^Fpa, Re, Rp, Rr, Aa, Aa, Aa, Aa, Ai, Wwrg, Ww, Ww
-Ha, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Kva, Gd^Esa, Gd^Esa, Aa, Aa, Aa, Gd^Esa, Aa^Fpa, Gd^Esa, Rd, Rd, Rd, Rd, Ms, Ha, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Rr, Ai, Ai^Esa, Ww, Ww, Ms, Ww, Ms^Xm, Ms^Xm
-Aa^Fpa, Aa^Fpa, Ha^Fpa, Aa^Fpa, Aa, Cva, Ha, Ha, Ms, Ha, Aa^Fpa, Aa, Ha^Fpa, Gd^Esa, Ha, Ms, Ms, Ms, Ms, Ha, Ha, Ha^Fpa, Ai, Ai, Ww^Es, Rr, Ww^Es, Wwrg, Ha^Vhha, Ha, Ms, Ms, Ms^Xm, Ms^Xm
-Aa^Fpa, Ha^Fpa, Ha^Fpa, Aa^Vha, Aa, Aa, Ha, Ms, Ms, Ha, Aa^Fpa, Ha^Fpa, Ha^Fpa, Aa, Ha, Ms, Ms, Ha, Ha, Ms, Ww, Ww, Ww, Ww, Ww, Ww^Bw|, Ai, Ww, Ms, Ha, Ha, Ms^Xm, Ms^Xm, Ms^Xm
-Aa^Fpa, Ha^Fpa, Aa^Fda, Ha, Aa, Aa, Aa, Ms, Ms, Ms, Ha, Aa, Gd, Aa, Ha, Ha^Vhha, Ms, Ha^Esa, Gd^Esa, Gd, Ww, Ww, Ww, Ww, Rr, Rr, Rr, Ai, Aa^Vha, Ha, Ms, Ms, Ms^Xm, Ms^Xm
-Aa, Aa, Aa^Fda, Aa, Aa, Aa, Aa, Ha, Rd, Ms, Rd, Gd, Aa, Aa, Aa, Ha, Ha, Ha, Wwf, Wwf^Es, Ha, Cea, Cea, Rr, Cea, Aa, Rb, Aa^Es, Ha, Ha, Ha, Ms, Ms, Ms
-Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Rd, Ha^Fpa, Rd, Ms, Ha, Aa, Aa, Ai, Ai, Ww, Wwf^Es, Aa, Aa, Ha^Fpa, Ha, Cea, 1 Kea, Cea, Ha, Rr, Aa, Aa^Fpa, Aa, Ha, Ms, Ms, Ms
-Aa^Fpa, Aa^Fpa, Aa^Fma, Aa, Aa^Fma, Aa, Aa, Aa^Vea, Aa, Ha, Ms, Ms, Ha^Esa, Ai^Esa, Ai, Ww, Ww, Gd, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha, Hhd, Cea, Hhd, Ha, Rr, Aa, Aa^Fpa, Aa, Ha^Fpa, Ms, Ms, Ms
-Ww, Ww, Gd^Fdw, Gd^Fdw, Gd^Fdw, Aa^Fda, Ai, Aa, Aa^Esa, Aa, Ha, Ha, Ww, Ai^Esa, Ww, Ww, Gd, Gd, Ha, Aa^Fpa, Rr, Hhd, Rr, Hhd, Rr^Esa, Rr^Esa, Aa^Esa, Aa^Fpa, Ms, Ha^Fpa, Ha^Fpa, Ha^Fpa, Ha, Ms
-Ww, Aa, Wwf, Gd, Ww, Ai, Ai, Aa, Ai, Ww, Ww, Ww, Ww, Ww, Ww, Ww, Gd, Mm, Ha, Rr, Aa, Rr, Hhd, Rr, Ha^Vhha, Aa^Esa, Aa, Aa^Fpa, Aa^Fpa, Ms, Ha, Ms, Ha, Ha
-Ai, Ww, Ww, Ww, Ww, Ww, Ww, Wwf, Ww, Ww, Ww, Ww, Ai, Ww, Ww, Aa, Aa, Gd^Esa, Rr^Esa, Rr, Ha, Ha, Hhd, Ms, Ha, Ha, Ha, Ha, Ha, Aa, Ha, Ha, Ha, Ms
-Ww, Ww, Ww, Wwf^Es, Wwf, Ww, Ai, Ww, Ww, Ww, Wwf, Ai, Ai, Ai, Ww, Ww, Aa, Rr, Rr, Gd, Hhd, Hhd, Hhd, Ha, Mm, Mm, Mm, Hhd, Ms, Ha, Ms, Ms, Ha, Ha
-Rd^Esa, Ww, Rd^Esa, Wwf, Rd^Esa, Aa, Aa, Ai, Ai, Ai, Ai, Aa, Ha, Ww, Gd, Aa, Aa, Aa, Rr^Esa, Gd, Ha, Mm, Mm, Ms, Ha, Mm, Hhd, Hhd, Mm, Ms, Mm, Ms, Ms, Ms
-Gd, Gd, Gd, Gd, Gd^Vc, Gd, Gd, Gd, Aa, Aa, Aa, Aa, Gd, Mm, Hhd, Aa, Gd^Vh, Rr, Gd, Gd, Hhd, Hhd, Ha, Ha, Mm, Hhd, Mm, Mm, Hhd, Mm, Mm, Mm, Mm, Ms
-Rr, Rd^Esa, Rd^Esa, Rd^Esa, Cea, Rd^Esa, Gd, Gd^Fdw, Aa^Fda, Aa^Fda, Aa, Gd, Rr, Hhd, Rr, Rr, Rr, Rr, Gd, Aa^Esa, Ha, Ha, Aa, Ha^Fpa, Ha^Fma, Mm, Hhd, Mm, Mm, Mm, Mm, Mm, Mm, Ms
-Rr, Rr, Rr, Cea, 2 Ke, Cea, Rr, Gd, Gd, Aa, Rr, Rr, Gd, Rr, Gd, Gd^Esa, Rr, Gd, Aa, Aa, Ms, Ha, Aa, Aa, Aa, Ha^Fpa, Hhd, Hhd, Hhd, Hhd, Ha^Fpa, Mm, Mm, Mm
-Rd^Esa, Rd^Esa, Gd, Cea, Cea, Cea, Aa, Rr, Rr, Rr, Aa, Gd, Aa^Esa, Gd, Gd, Gd, Rr, Gd, Aa^Esa, Ha, Ha^Esa, Aa^Esa, Gd, Gd, Aa, Aa, Gd, Hhd, Gd, Ha, Ha, Ha^Fpa, Mm, Ms
-Gll^Fdw, Gd, Aa, Aa, Aa, Aa, Aa^Esa, Rd, Rd, Rd, Aa^Esa, Aa^Esa, Gd^Esa, Gd^Esa, Rr^Es, Rr, Gd, Gd, Gd, Aa^Esa, Aa, Aa, Aa, Gd, Gd, Aa^Fpa, Aa^Fpa, Gd, Aa, Aa, Ha, Mm, Ms, Ms
-Gll^Fdw, Gd, Gd, Gd, Gd, Aa, Aa, Gd^Vht, Gd, Aa, Aa, Aa^Esa, Gd, Gd, Rr, Gd, Gd^Es, Gd, Gd, Aa^Esa, Gd, Gd, Aa, Aa, Aa, Aa^Fpa, Gd^Fp, Gd^Fp, Aa, Aa, Aa, Ms, Ms, Ms
-Aa, Gd, Aa, Gd^Vh, Aa, Aa, Aa, Aa, Gd, Aa, Aa^Esa, Aa^Es, Re, Rr, Gd, Gd, Gd, Gd, Gd, Gd^Fp, Gd^Fp, Gd^Ve, Hh, Ms, Hh, Gd, Gs^Fp, Gd, Hh, Hhd, Mm, Ha, Ha^Fpa, Aa^Fpa
-Aa, Gd^Esa, Aa, Aa, Aa, Aa, Aa, Gd, Aa, Aa, Gd, Re, Gd^Vh, Re, Gd, Gd, Gd^Fp, Gd, Gd, Gd^Fp, Gd, Gd, Gd, Mm, Gd, Gd, Gs^Fp, Gd^Ve, Hh^Fp, Hh^Fp, Mm, Hhd, Ha^Fpa, Ha^Fpa
-Aa, Aa^Esa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Aa, Gd, Gd, Gd, Gd, Gd^Fp, Gs^Fp, Gd^Fp, Gd^Fp, Gd, Gs^Fp, Gd, Gd^Ve, Gd, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh, Mm, Hh, Hh^Fp, Hh, Hh
-Ha, Ha, Aa, Aa, Ha^Fda, Aa, Aa, Aa, Aa, Aa, Ha, Gd^Esa, Aa, Gd, Gd, Gd, Gd, Gd, Gd^Fp, Gs^Fp, Gs^Efm, Gs^Fp, Gs^Fp, Gs^Fp, Cv, Cv, Cv, Gs^Fp, Hh, Hh, Mm, Mm, Hh^Fp, Hh^Fp
-Ha, Ha^Fda, Ha, Aa, Aa, Ha, Gd, Gd^Esa, Gd, Aa, Aa, Hh^Esa, Gd, Gd, Gd^Fp, Gd, Gd, Gd^Fp, Gd^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Efm, Gs^Efm, Cv, 3 Kv, Cv, Gs^Fp, Hh^Fp, Hh, Hh, Hh, Hh^Fp, Hh^Fp
-Aa^Fda, Aa, Aa, Aa, Aa^Vha, Gd, Gd, Gd^Es, Gd, Aa, Aa, Aa, Gd, Gd^Fp, Gd^Fp, Gd, Gd^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Hh, Gs^Efm, Gs^Fp, Cv, Gs^Fp, Gs^Fp, Hh, Hh^Fp, Gs, Hh^Fp, Hh^Fp, Hh^Fp
-Aa, Aa^Fda, Aa^Fda, Aa, Aa^Fma, Aa^Fma, Gd, Gd, Gd, Gd^Es, Gd, Gd, Gd, Gd^Fp, Gs, Gd^Fp, Gs^Fp, Gs^Fp, Gs^Efm, Gs^Fp, Gs^Fp, Gs^Ve, Hh^Fp, Hh^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Ve, Gs^Fp, Gs^Fp, Gs^Fp, Gs, Hh^Fp, Hh^Fp
-Aa^Fpa, Aa^Fma, Aa^Fma, Aa^Fda, Aa^Fpa, Gd, Gll^Fp, Gll^Fp, Gd, Gd, Gd, Gd^Fp, Gd^Fp, Gs^Fp, Gs, Gs^Fp, Gs^Efm, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Efm, Gs^Fp, Hh, Hh, Gs^Efm, Gs^Fp, Gs^Efm, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Efm, Gs^Ve, Hh, Hh
-Rr, Aa^Fda, Aa^Fma, Aa^Fpa, Aa^Fda, Gd, Gd, Gll^Fp, Gd, Gd, Gd^Fp, Gs^Fp, Gd^Fp, Gs^Fp, Gs, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Fp, Gs, Gs^Fp, Gs, Gs^Fp, Gs^Fp, Gs^Fp, Gs^Efm, Gs^Efm, Hh, Hh
+Ms, Ms, Ms, Ms, Ms, Ms, Ms, Ha, Ha, Ha, Ha, Ha, Ha, Aa, Aa, Aa, Aa, Aa, Ai, Ww, Ww, Aa, Ms, Ms, Re, Ms, Ms, Ms, Ms, Ha, Ha, Ha
+Ms, Ms, Ms, Ms, Ms, Ms, Ms, Ha, Ms, Ms, Ms, Ha, Ha, Ha, Aa, Aa, Aa^Fpa, Aa^Fpa, Wwf, Ww, Ww, Ha, Ms, Ms, Re, Ms, Ms, Ms, Ms, Ms, Ha, Ha
+Aa, Ms, Ms, Ms, Ms, Ms, Ha, Ha, Ms, Ms, Ms, Aa^Fpa, Aa^Fpa, Aa^Fpa, Rd, Aa, Aa, Aa^Fpa, Ww, Ww, Ai, Ha, Ha, Cfa^Ebn, Re, Re, Ms, Ms, Ms, Cfa^Eb, Ha, Ha
+Aa, Aa, Aa, Aa, Ha, Ha^Vhha, Ha, Ha, Ha, Ms, Ha^Fpa, Aa^Fpa, Ha^Fpa, Rd, Aa^Fpa, Aa, Aa^Fpa, Aa, Ww, Wwf, Wwf, Ha, Rd, Re, Re, Cfa^Ebn, Ms, Ms, Ha, Ha, Ha, Ha
+Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Ha, Aa, Ha, Ha, Ha^Fpa, Ha^Fpa, Ha^Fpa, Ha, Rd, Rd, Aa, Aa, Ai, Ww, Ww, Rd, Rd, Aa, Ha, Ms, Ms, Ha, Ha, Ha, Ha, Ha^Vhha, Ha
+Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa^Esa, Aa, Aa, Aa^Fpa, Ha, Aa^Fpa, Aa, Ha, Rd, Aa, Ha, Ai, Ww^Bw/, Ww^Bw/, Rd, Aa, Aa, Ha, Ha, Ha, Gd^Es, Aa, Aa^Fpa, Ha, Ha, Ha
+Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa^Fpa, Aa, Aa, Aa, Aa, Aa, Rd, Ha^Fpa, Rd, Rd, Ww, Ww, Aa, Aa^Esa, Aa, Ha^Vhha, Ha, Ha, Ha^Fpa, Ha^Fpa, Aa^Fpa, Ha, Aa^Fpa, Ha
+Aa^Fpa, Aa^Vea, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa^Fpa, Aa, Aa^Fpa, Aa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Aa, Rd, Rd, Ww, Ww, Wwf, Ww, Aa, Aa, Aa, Ha, Ha^Fpa, Ha, Aa^Fpa, Gd^Es, Ha^Fpa, Aa^Fpa, Aa^Fpa
+Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Ms, Aa, Aa, Aa^Fpa, Ms, Ms, Ms, Rd, Rd, Aa^Fpa, Ha^Fpa, Wwf, Wwf, Ww, Ai, Ha, Ha, Ha, Ms, Ha, Aa^Fpa, Aa^Fpa, Aa, Aa
+Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Ha, Ms, Ms, Ms, Ha^Fpa, Ha, Ha, Rr, Rr, Ms, Rd, Aa, Ms, Ms, Ha, Ww, Ai, Ha, Ms, Ms, Ms, Ms, Ha, Aa^Fpa, Aa^Vea, Aa
+Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Ha, Ms, Ms, Ms, Ha^Fpa, Aa^Fpa, Aa^Fpa, Cfa, 1 Kfa, Ha^Vhha, Rd, Aa, Aa, Ms, Ha^Fpa, Ww, Ww, Ms, Ms, Ms, Ms, Ms, Ha, Aa^Fpa, Aa^Fpa, Aa^Fpa
+Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa, Aa^Esa, Ha, Ha, Ha, Ha, Ha, Aa^Fpa, Aa, Cfa, Cfa, Cfa, Aa, Rd, Aa, Ha^Fpa, Ai, Wwf, Wwf, Ms, Ms, Ms, Ha, Ha, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
+Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa, Aa^Esa, Aa, Aa, Ha, Aa, Ha, Aa, Aa, Aa, Ha, Aa, Aa, Rd, Rd, Aa^Esa, Ai, Ww, Wwf, Ww, Ww, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
+Gll^Fp, Gll^Fmw, Gll^Fmf, Gg, Aa, Aa, Aa, Aa, Aa^Esa, Aa, Aa, Aa^Esa, Aa, Aa, Re, Re, Cea, Aa, Aa, Ww, Ww, Ww, Ha, Aa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa
+Gg, Gg^Eff, Gg^Eff, Gg, Gg, Aa, Gg, Aa, Aa, Aa, Aa^Fpa, Aa^Vha, Rp, Re, Aa, Aa, Aa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Ww, Ww, Ms, Ha, Ha, Ha^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Ha^Fpa
+Gll^Gvs, Gll^Gvs, Gg^Gvs, Gs^Vh, Gg^Efm, Gll^Fmf, Aa, Aa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Rr, Re^Esa, Wwf, Wwf, Ww, Aa^Fpa, Ai, Ha^Fpa, Ww, Ms, Ms^Vhha, Ha, Aa^Fpa, Ha^Fpa, Aa, Aa, Aa^Fpa, Aa^Fpa, Ha^Fpa, Ha^Fpa
+Gll^Gvs, Gll^Gvs, Gg^Eff, Gg^Eff, Gg, Gg, Ha, Aa, Ha^Fpa, Aa^Fpa, Aa^Fpa, Cea, Rr, Rr, Ww, Gll^Fmf, Ww, Ww, Ww, Ww, Gg, Ha, Hh^Fp, Ha^Fdw, Gs, Aa, Cva, Aa^Vea, Aa, Aa^Fpa, Aa^Fpa, Ha
+Gll^Gvs, Gll^Gvs, Gg^Eff, Gg^Eff, Hh, Hh, Ms, Ha, Ww, Ha^Fpa, Ww, Ww, Ww, Ww^Bsb\, Ww^Bsb\, Ww, Aa, Ai, Aa^Esa, Gg, Gg, Gll^Fp, Gs, Gs, Aa, Cea, 3 Kva, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa^Fpa, Aa
+Ss, Gg^Eff, Ww, Gg, Ww, Ww, Ww, Ww, Md, Ww, Hh, Hh, Gs, Rp, Chr, Rr, Rr^Esa, Aa, Gs^Es, Aa, Gg, Gg, Gd^Es, Gd^Fdw, Cea, Cva, Cva, Ha^Fpa, Ms, Aa, Ha, Aa
+Ww, Ww, Ss, Ww, Gg, Hh, Hh^Fp, Hh, Hh, Hh, Gs, Hh^Fmw, Gd, Re, Rp, Rp, Gs, Gs^Es, Re, Gg^Fmw, Gll^Fmw, Gg^Fmw, Gg^Fmw, Aa, Aa^Fda, Cea, Hh^Fmw, Mm^Fdw, Ms, Ms, Ha, Ha
+Ww, Ss, Gg^Fp, Gg^Fp, Gg^Fp, Gg^Fp, Gg^Fp, Gs, Gs, Gs, Gg^Es, Gs, Rb, Rp, Rb, Rb, Hh, Gs, Gg^Fmw, Gg, Gll^Fmw, Gll^Fmw, Gg^Fmw, Gg, Gg, Hh^Fmw, Hh^Fmw, Mm, Hh, Ha, Hh, Ha
+Ss, Ss, Gg^Efm, Gg^Efm, Gg, Gll^Fmf, Gg, Gg, Hh, Gg, Gg, Re, Re, Re, Gg, Gg^Es, Gg, Hh^Fmw, Gg, Gg, Gll^Fmf, Gll^Fp, Gg^Eff, Gg, Gg, Gg^Fdw, Gg, Hh, Hh, Hh, Hh^Fp, Hh
+Ss, Ss, Gg, Gg, Gg, Gg, Gg^Es, Hh, Gg, Gs, Gg, Rp, Re, Re, Gg, Ss, Ss, Gg, Gll^Fp, Gg, Gg^Eff, Gg^Eff, Gs^Vh, Gg^Eff, Gg^Eff, Gg, Gg^Fp, Gg, Gg^Fp, Hh^Fp, Gg^Fp, Hh^Fp
+Ss, Gg, Gg, Gg, Re^Eff, Gg, Re, Gg, Re, Gg, Gg^Fp, Gg, Re, Re, Re, Ss, Gg, Gll^Fmw, Gll^Fmf, Gll^Fp, Gg^Gvs, Gg^Gvs, Gg^Gvs, Gg^Gvs, Gg^Eff, Gg, Gg^Fp, Gg^Fp, Gg^Fp, Gg^Fp, Gll^Fmf, Gg^Fp
+Gg, Gg, Gg^Eff, Gg^Eff, Re^Vh, Re^Eff, Re^Eff, Re, Re, Re, Re, Gg, Re, Re, Re, Gg, Gg, Gg, Gg, Gg^Eff, Gg^Eff, Gg^Gvs, Gll^Fp, Gg^Eff, Gg, Gg, Gg, Gg^Fp, Gg^Fp, Gg^Fp, Gg^Fp, Gg^Fp
+Gg^Eff, Gg^Eff, Gg^Gvs, Gg^Gvs, Re^Gvs, Re^Gvs, Gg^Gvs, Re^Eff, Gll^Fmw, Re, Re, Re, Re, Re, Hh, Gg, Gg^Es, Gg, Gg, Gg, Gs, Gg, Gg, Gg, Gg, Gg, Gg^Efm, Gg, Gll^Fmf, Gg^Fp, Gg^Fp, Gg^Fp
+Gg, Gg^Gvs, Gg^Gvs, Gg^Gvs, Gg^Gvs, Gg^Gvs, Gg^Eff, Gg^Eff, Gg, Re, Re, Re, Gg, Hh, Hh^Fmw, Gg, Gg, Gll^Fmw, Gg^Fp, Gg^Fp, Gg^Fp, Gs, Gg, Gg, Gg, Gg^Efm, Gg^Efm, Gg^Efm, Gll^Fmf, Gll^Fmf, Gg, Gg^Fp
+Gg^Gvs, Gg^Gvs, Gg^Gvs, Gg^Gvs, Gg^Gvs, Gg^Eff, Gg^Eff, Gg, Gg, Re, Re, Re, Gs, Gs, Gg, Gll^Fmw, Gg, Gg, Gll^Fmw, Gg^Fp, Gll^Fmw, Gs, Gg, Gg^Fp, Gg^Fp, Gg^Fp, Gg^Fp, Gg, Gll^Fmf, Gll^Fmf, Gll^Fmf, Gll^Fmf
+Gg^Gvs, Gg^Gvs, Gg^Gvs, Gg^Gvs, Gg^Eff, Gg^Eff, Gg, Gg^Es, Gg, Re, Re, Re, Re, Gs, Gg, Gg, Gs, Gll^Fmw, Gg, Gg, Hh^Fmw, Hh, Hh, Gg^Fp, Hh^Fmw, Gg^Fp, Hh, Gg, Gll^Fmf, Gg, Gg, Gg
+Gg^Gvs, Gg^Gvs, Gg^Eff, Gg^Eff, Gll^Fmw, Gg, Gg, Gg, Ce, Re, Re, Re, Re, Gg, Gg, Gs^Es, Gs, Gs, Gg, Gg, Gg, Gg, Hh, Hh, Hh, Hh, Mm, Hh, Hh, Gll^Fmf, Gll^Fmf, Hh
+Gg^Eff, Gg^Eff, Gs, Gs, Gg, Gg, Re, Ce, 2 Ke, Ce, Re, Re, Re, Gg, Gg^Eff, Gg, Gg, Gg, Gg, Hh, Hh, Hh, Hh, Mm, Mm, Mm, Mm, Mm, Hh, Gll^Fmf, Hh, Hh
+Gg, Gg, Gg, Gs, Gg, Gg, Re, Ce, Ce, Ce, Re, Re, Gg^Eff, Gg^Eff, Gs^Vh, Gg^Eff, Gs^Eff, Gs, Gg, Gg^Fp, Gll^Fmf, Hh, Gg^Fp, Mm, Hh, Mm, Hh, Hh, Hh, Hh, Hh, Hh
+Gg^Fp, Gg, Gg^Fp, Gg, Re, Re, Re, Re, Re, Re, Re, Gll^Fmw, Gs^Eff, Gs, Gs^Gvs, Gs^Gvs, Gs^Gvs, Gs^Eff, Gg^Eff, Gg^Fp, Gg, Gg, Gg^Fp, Gg^Fp, Gg^Fp, Hh, Mm, Mm, Hh, Gll^Fmf, Gll^Fmf, Gg
+Gg, Gll^Fmf, Gll^Fmf, Gg, Re, Re, Gg, Gg, Re, Re, Re, Re, Re, Gs^Eff, Gs, Gs^Gvs, Gs, Gs, Gs, Gg^Eff, Gg, Gg^Fp, Gg, Gll^Fmf, Gg, Hh, Hh, Gll^Fmf, Gg, Gll^Fmf, Gg, Gg
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
index 8bb2e376e8d5..8b19e689b278 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
@@ -28,7 +28,7 @@
         {FLAG_VARIANT knalgan}
     [/side]
 
-    {STARTING_VILLAGES 1 5}
+    {STARTING_VILLAGES 1 7}
 
     [side]
         type=Haldric II
@@ -40,6 +40,7 @@
         profile=portraits/haldric-ii.png
         {RECRUIT (Swordsman,Longbowman,Dragoon,Cavalryman,Red Mage,Mage) (Swordsman,Longbowman,Cavalryman,Red Mage,Mage) (Swordsman,Longbowman,Cavalryman,Mage)}
         {GOLD 150 125 100}
+        income=5
         team_name=dwarves
         user_team_name= _ "Dwarves"
         [ai]
@@ -67,22 +68,24 @@
                 protect_radius=6
             [/goal]
         [/ai]
-        {LOYAL_UNIT 2 "Royal Guard" 2 22}{GUARDIAN}
+        {LOYAL_UNIT 2 "Royal Guard" 6 28}{GUARDIAN}
         [+unit]
             facing=ne
         [/unit]
-        {LOYAL_UNIT 2 "Halberdier" 7 21}{GUARDIAN}
+#ifdef EASY
+        {LOYAL_UNIT 2 "Halberdier" 8 27}{GUARDIAN}
         [+unit]
             facing=ne
         [/unit]
-        {LOYAL_UNIT 2 "Royal Guard" 2 18}{GUARDIAN}
+#endif
+        {LOYAL_UNIT 2 "Royal Guard" 10 28}{GUARDIAN}
         [+unit]
             facing=se
         [/unit]
         {FLAG_VARIANT loyalist}
     [/side]
 
-    {STARTING_VILLAGES 2 5}
+    {STARTING_VILLAGES 2 7}
 
     [side]
         type=Elvish Captain
@@ -104,7 +107,7 @@
             [/object]
         [/modifications]
         {RECRUIT (Elvish Fighter,Elvish Scout,Elvish Archer) (Elvish Fighter,Elvish Scout,Elvish Archer,Elvish Shaman) (Elvish Fighter,Elvish Scout,Elvish Archer,Elvish Shaman)}
-        {GOLD 125 150 175}
+        {GOLD 120 150 180}
         {INCOME 8 10 12}
         team_name=elves
         user_team_name= _ "Elves"
@@ -113,7 +116,7 @@
         [leader]
             type=Elvish Fighter
             id=leader2
-            x,y=5,6
+            x,y=1,7
         [/leader]
         [ai]
             {AI_SIMPLE_ALWAYS_ASPECT passive_leader yes}
@@ -131,7 +134,7 @@
                     [value]
                         [limit]
                             type=
-                            max=8
+                            max=10
                         [/limit]
                         [limit]
                             type=Elvish Shaman
@@ -141,7 +144,7 @@
                             leader_id=leader2
                             type=archer
                             pattern=yes
-                            number=2
+                            number=-1
                             importance=1
                             blocker=no
                         [/recruit]
@@ -162,7 +165,7 @@
                             leader_id=leader2
                             pattern=yes
                             type=fighter
-                            number=2
+                            number=-1
                             importance=1
                             blocker=no
                         [/recruit]
@@ -177,7 +180,7 @@
         {FLAG_VARIANT wood-elvish}
     [/side]
 
-    {STARTING_VILLAGES 3 6}
+    {STARTING_VILLAGES 3 7}
 
     [story]
         # the background images are placeholders from the core assets
@@ -199,8 +202,8 @@
 
     {SOF_DEATHS}
 
-    {SOF_RUNIC_CHEST_SWIFTNESS 23 10}
-    {SOF_RUNIC_CHEST_FORCE 24 9}
+    {SOF_RUNIC_CHEST_SWIFTNESS 13 9}
+    {SOF_RUNIC_CHEST_FORCE 14 9}
 
     [event]
         name=prestart
@@ -276,13 +279,20 @@
 
         [capture_village]
             side=1
-            x=1-30
-            y=1-9
+            x=23,30
+            y=6,4
         [/capture_village]
         [item]
             image=scenery/rock-cairn2.png
-            x,y=19,16
+            x,y=16,7
         [/item]
+        [store_unit]
+            [filter]
+                id=leader2
+            [/filter]
+            variable=leader2
+            kill=yes
+        [/store_unit]
     [/event]
 
     [event]
@@ -408,7 +418,7 @@
             message= _ "Very well. I have the silver here, ready to ship, and I will send someone over with the stone itself. He will stay with you as you make the sceptre, and make sure you are going to get it done on time. I expect it done before my reign as king is ended."
         [/message]
         [unit]
-            x,y=1,20
+            x,y=10,29
             type=Caravan
             side=1
             facing=ne
@@ -417,7 +427,7 @@
             [/modifications]
         [/unit]
         [unit]
-            x,y=1,19
+            x,y=11,29
             type=Caravan
             side=1
             facing=ne
@@ -426,7 +436,7 @@
             [/modifications]
         [/unit]
         [unit]
-            x,y=2,19
+            x,y=10,30
             type=Caravan
             side=1
             facing=ne
@@ -435,7 +445,7 @@
             [/modifications]
         [/unit]
         [unit]
-            x,y=2,20
+            x,y=11,30
             type=Caravan
             side=1
             facing=ne
@@ -445,7 +455,7 @@
         [/unit]
 #ifdef HARD
         [unit]
-            x,y=1,21
+            x,y=10,31
             type=Caravan
             side=1
             facing=ne
@@ -455,7 +465,7 @@
         [/unit]
 #endif
         [unit]
-            x,y=3,19
+            x,y=12,30
             type=Dragoon
             side=1
             id=Alanin
@@ -474,7 +484,7 @@
         [/message]
         [message]
             speaker=Glildur
-            message= _ "Hey! You can’t do that — this road is an elvish road. We’re not letting you transport gold and jewels on it without paying a toll."
+            message= _ "Hey!  You can’t do that — this road is an elvish road. We’re not letting you transport gold and jewels on it without paying a toll."
         [/message]
         [message]
             speaker=Rugnur
@@ -513,7 +523,7 @@
         [/message]
         # to make it very hard for player to just kill the elves
         [unit]
-            x,y=25,26
+            x,y=22,16
             type=Elvish Hero
             side=3
             facing=nw
@@ -524,7 +534,7 @@
             ai_special=guardian
         [/unit]
         [unit]
-            x,y=24,30
+            x,y=26,20
             type=Elvish Avenger
             side=3
             facing=nw
@@ -534,7 +544,7 @@
             ai_special=guardian
         [/unit]
         [unit]
-            x,y=27,28
+            x,y=24,15
             type=Elvish Ranger
             side=3
             facing=nw
@@ -544,7 +554,7 @@
             ai_special=guardian
         [/unit]
         [unit]
-            x,y=24,26
+            x,y=23,18
             type=Elvish Ranger
             side=3
             facing=nw
@@ -555,7 +565,7 @@
         [/unit]
         [item]
             image=items/gohere.png
-            x,y=29,1
+            x,y=24,1
         [/item]
     [/event]
 
@@ -564,7 +574,7 @@
         name=moveto
         [filter]
             side=3
-            x,y=2-7,17-23
+            x,y=11-17,25-27
         [/filter]
         [gold]
             side=2
@@ -572,9 +582,100 @@
         [/gold]
     [/event]
 
+    # secondary elf leader
+    [event]
+        name=enter_hex
+        [filter]
+            side=1
+            y=8,18
+        [/filter]
+        [unstore_unit]
+            variable=leader2
+            find_vacant=no
+        [/unstore_unit]
+        {CLEAR_VARIABLE leader2}
+        {MOVE_UNIT (id=leader2) 11 2}
+        [terrain]
+            x,y=11,2
+            terrain=Ke
+        [/terrain]
+        [redraw]
+            side=1
+        [/redraw]
+        [delay]
+            time=100
+        [/delay]
+        [terrain]
+            x,y=11,3
+            terrain=Ce
+        [/terrain]
+        [redraw]
+            side=1
+        [/redraw]
+        [delay]
+            time=100
+        [/delay]
+        {GENERIC_UNIT 3 "Elvish Archer" 11 3}
+        [+unit]
+            facing=se
+        [/unit]
+        [delay]
+            time=100
+        [/delay]
+        [terrain]
+            x,y=12,2
+            terrain=Ce
+        [/terrain]
+        [redraw]
+            side=1
+        [/redraw]
+        [delay]
+            time=100
+        [/delay]
+        {GENERIC_UNIT 3 "Elvish Archer" 12 2}
+        [+unit]
+            facing=se
+        [/unit]
+#ifdef HARD
+        [delay]
+            time=100
+        [/delay]
+        [terrain]
+            x,y=13,2
+            terrain=Ce
+        [/terrain]
+        [redraw]
+            side=1
+        [/redraw]
+        [delay]
+            time=100
+        [/delay]
+        {GENERIC_UNIT 3 "Elvish Archer" 13 2}
+        [+unit]
+            facing=se
+        [/unit]
+#endif
+        [capture_village]
+            side=3
+            x=1,5
+            y=7,3
+        [/capture_village]
+        [message]
+            speaker=Alanin
+            message= _ "Oh, the elves are going to cut us off!"
+        [/message]
+        [message]
+            speaker=Glildur
+            message= _ "I told you this was our road."
+        [/message]
+        [cancel_action]
+        [/cancel_action]
+    [/event]
+
+
 #define SOF1_HOME_AREA
-    x=26,27-28,29-32
-    y=1-2,1-3,1-4 #enddef
+    x=23-25
+    y=1-3 #enddef
 
     # Alanin reaches the dwarvish citadel
 
@@ -737,25 +838,25 @@
         name=turn 9
         # not enough to actually swamp the player, but still present and trouble
         [unit]
-            x,y=32,27
+            x,y=26,14
             type=Elvish Scout
             side=3
             facing=nw
         [/unit]
         [unit]
-            x,y=31,29
+            x,y=28,14
             type=Elvish Scout
             side=3
             facing=nw
         [/unit]
         [unit]
-            x,y=32,30
+            x,y=27,16
             type=Elvish Rider
             side=3
             facing=nw
         [/unit]
         [unit]
-            x,y=28,31
+            x,y=29,16
             type=Elvish Rider
             side=3
             facing=nw
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
index de68b073bbf1..aa7d02db5e74 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
@@ -262,6 +262,7 @@
     [event]
         name=start
         {MOVE_UNIT id=Rugnur 22 12}
+        {MODIFY_UNIT id=Glildur facing ne}
         [recall]
             id=Alanin
         [/recall]
@@ -292,6 +293,7 @@
             speaker=Glildur
             message= _ "I see you have sent a messenger to the city. Good idea, but will it really help? We have more troops and more provisions, and we are going to enter those caves and kill you!"
         [/message]
+        {MODIFY_UNIT id=Rugnur facing sw}
         [message]
             speaker=Rugnur
             message= _ "(<i>Gulp</i>)"