diff --git a/mods/ra/maps/caffeinated/map.uid b/mods/ra/maps/caffeinated/map.uid
index 10ab3670a5..06ea1b25d7 100644
--- a/mods/ra/maps/caffeinated/map.uid
+++ b/mods/ra/maps/caffeinated/map.uid
@@ -1 +1 @@
-7f79da9c37a5c9798fc554e5552c6edd2e5e40e2
\ No newline at end of file
+4652ffe1a2a700ff184f277f1ba2151c25eb1ff6
\ No newline at end of file
diff --git a/mods/ra/maps/caffeinated/map.yaml b/mods/ra/maps/caffeinated/map.yaml
index 415fe671fe..f11685df24 100644
--- a/mods/ra/maps/caffeinated/map.yaml
+++ b/mods/ra/maps/caffeinated/map.yaml
@@ -4,7 +4,9 @@ MapFormat: 1
 
 Title: Caffeinated
 
-Author: Westwood Studios
+Description:
+
+Author: Chris Forbes & Bob Pepperell
 
 PlayerCount: 8
 
@@ -17,116 +19,116 @@ TopLeft: 16,16
 BottomRight: 112,112
 
 Actors:
-	Actor0: v13 Neutral 42,92
-	Actor1: t01 Neutral 97,52
-	Actor2: tc02 Neutral 99,58
-	Actor3: tc02 Neutral 52,91
-	Actor4: t01 Neutral 42,104
-	Actor5: t01 Neutral 41,105
-	Actor6: tc04 Neutral 39,104
-	Actor7: tc05 Neutral 37,100
-	Actor8: tc05 Neutral 87,62
-	Actor9: t15 Neutral 48,89
-	Actor10: tc04 Neutral 36,88
-	Actor11: tc03 Neutral 46,89
-	Actor12: tc02 Neutral 44,91
-	Actor13: t16 Neutral 64,46
-	Actor14: t16 Neutral 66,47
-	Actor15: tc04 Neutral 73,94
-	Actor16: tc02 Neutral 71,95
-	Actor17: tc01 Neutral 69,95
-	Actor18: t17 Neutral 67,95
-	Actor19: t17 Neutral 73,97
-	Actor20: t17 Neutral 72,96
-	Actor21: tc01 Neutral 60,90
-	Actor22: tc01 Neutral 78,110
-	Actor23: t16 Neutral 78,109
-	Actor24: t16 Neutral 77,107
-	Actor25: t17 Neutral 75,110
-	Actor26: t17 Neutral 105,66
-	Actor27: t16 Neutral 103,63
-	Actor28: t15 Neutral 99,60
-	Actor29: t15 Neutral 83,51
-	Actor30: tc04 Neutral 79,49
-	Actor31: tc01 Neutral 70,50
-	Actor32: tc05 Neutral 99,43
-	Actor33: tc01 Neutral 94,45
-	Actor34: tc01 Neutral 93,44
-	Actor35: tc04 Neutral 95,43
-	Actor36: t17 Neutral 90,39
-	Actor37: t17 Neutral 100,53
-	Actor38: t17 Neutral 100,54
-	Actor39: tc04 Neutral 98,56
-	Actor40: tc04 Neutral 42,34
-	Actor41: tc04 Neutral 20,60
-	Actor42: t16 Neutral 49,61
-	Actor43: t17 Neutral 62,67
-	Actor44: tc02 Neutral 43,22
-	Actor45: mine Neutral 50,52
-	Actor46: mine Neutral 50,66
-	Actor47: mine Neutral 28,72
-	Actor48: mine Neutral 20,71
-	Actor49: mine Neutral 34,104
-	Actor50: mine Neutral 44,107
-	Actor51: mine Neutral 106,87
-	Actor52: mine Neutral 109,59
-	Actor53: mine Neutral 106,56
-	Actor54: mine Neutral 81,35
-	Actor55: mine Neutral 81,37
-	Actor56: mine Neutral 109,25
-	Actor57: mine Neutral 71,29
-	Actor58: mine Neutral 51,18
-	Actor59: mine Neutral 18,18
-	Actor60: t01 Neutral 39,106
-	Actor61: t01 Neutral 40,105
-	Actor62: t03 Neutral 40,106
-	Actor63: t05 Neutral 41,106
-	Actor64: t05 Neutral 34,107
-	Actor65: t13 Neutral 34,108
-	Actor66: t14 Neutral 37,110
-	Actor67: tc04 Neutral 34,109
-	Actor68: t17 Neutral 36,110
-	Actor69: t17 Neutral 35,110
-	Actor70: t02 Neutral 41,107
-	Actor71: t02 Neutral 41,108
-	Actor72: t08 Neutral 41,110
-	Actor73: t08 Neutral 42,109
-	Actor74: t05 Neutral 42,107
-	Actor75: mine Neutral 61,81
-	Actor76: mine Neutral 17,54
-	Actor77: t05 Neutral 97,26
-	Actor78: t10 Neutral 96,28
-	Actor79: t08 Neutral 98,30
-	Actor80: mine Neutral 92,20
-	Actor81: t08 Neutral 74,28
-	Actor82: t05 Neutral 74,26
-	Actor83: t10 Neutral 75,25
-	Actor84: mine Neutral 57,101
-	Actor85: t13 Neutral 88,88
-	Actor86: tc04 Neutral 84,89
-	Actor87: tc01 Neutral 86,88
-	Actor88: tc05 Neutral 96,31
-	Actor89: tc01 Neutral 96,30
-	Actor90: t16 Neutral 96,29
-	Actor91: t16 Neutral 97,29
-	Actor92: tc04 Neutral 48,41
-	Actor93: tc01 Neutral 46,37
-	Actor94: tc01 Neutral 54,37
-	Actor95: tc01 Neutral 53,38
-	Actor96: t17 Neutral 55,39
-	Actor97: t16 Neutral 48,34
-	Actor98: mine Neutral 90,110
-	Actor99: tc01 Neutral 97,95
-	Actor100: mine Neutral 35,23
-	Actor101: t01 Neutral 48,94
-	Actor102: t01 Neutral 53,92
-	Actor103: t01 Neutral 53,95
-	Actor104: t01 Neutral 59,88
-	Actor105: t01 Neutral 59,87
-	Actor106: t02 Neutral 54,94
-	Actor107: t02 Neutral 56,39
-	Actor108: t02 Neutral 56,38
-	Actor109: t08 Neutral 57,40
+	Actor0: v13 42,92 42,92
+	Actor1: t01 97,52 97,52
+	Actor2: tc02 99,58 99,58
+	Actor3: tc02 52,91 52,91
+	Actor4: t01 42,104 42,104
+	Actor5: t01 41,105 41,105
+	Actor6: tc04 39,104 39,104
+	Actor7: tc05 37,100 37,100
+	Actor8: tc05 87,62 87,62
+	Actor9: t15 48,89 48,89
+	Actor10: tc04 36,88 36,88
+	Actor11: tc03 46,89 46,89
+	Actor12: tc02 44,91 44,91
+	Actor13: t16 64,46 64,46
+	Actor14: t16 66,47 66,47
+	Actor15: tc04 73,94 73,94
+	Actor16: tc02 71,95 71,95
+	Actor17: tc01 69,95 69,95
+	Actor18: t17 67,95 67,95
+	Actor19: t17 73,97 73,97
+	Actor20: t17 72,96 72,96
+	Actor21: tc01 60,90 60,90
+	Actor22: tc01 78,110 78,110
+	Actor23: t16 78,109 78,109
+	Actor24: t16 77,107 77,107
+	Actor25: t17 75,110 75,110
+	Actor26: t17 105,66 105,66
+	Actor27: t16 103,63 103,63
+	Actor28: t15 99,60 99,60
+	Actor29: t15 83,51 83,51
+	Actor30: tc04 79,49 79,49
+	Actor31: tc01 70,50 70,50
+	Actor32: tc05 99,43 99,43
+	Actor33: tc01 94,45 94,45
+	Actor34: tc01 93,44 93,44
+	Actor35: tc04 95,43 95,43
+	Actor36: t17 90,39 90,39
+	Actor37: t17 100,53 100,53
+	Actor38: t17 100,54 100,54
+	Actor39: tc04 98,56 98,56
+	Actor40: tc04 42,34 42,34
+	Actor41: tc04 20,60 20,60
+	Actor42: t16 49,61 49,61
+	Actor43: t17 62,67 62,67
+	Actor44: tc02 43,22 43,22
+	Actor45: mine 50,52 50,52
+	Actor46: mine 50,66 50,66
+	Actor47: mine 28,72 28,72
+	Actor48: mine 20,71 20,71
+	Actor49: mine 34,104 34,104
+	Actor50: mine 44,107 44,107
+	Actor51: mine 106,87 106,87
+	Actor52: mine 109,59 109,59
+	Actor53: mine 106,56 106,56
+	Actor54: mine 81,35 81,35
+	Actor55: mine 81,37 81,37
+	Actor56: mine 109,25 109,25
+	Actor57: mine 71,29 71,29
+	Actor58: mine 51,18 51,18
+	Actor59: mine 18,18 18,18
+	Actor60: t01 39,106 39,106
+	Actor61: t01 40,105 40,105
+	Actor62: t03 40,106 40,106
+	Actor63: t05 41,106 41,106
+	Actor64: t05 34,107 34,107
+	Actor65: t13 34,108 34,108
+	Actor66: t14 37,110 37,110
+	Actor67: tc04 34,109 34,109
+	Actor68: t17 36,110 36,110
+	Actor69: t17 35,110 35,110
+	Actor70: t02 41,107 41,107
+	Actor71: t02 41,108 41,108
+	Actor72: t08 41,110 41,110
+	Actor73: t08 42,109 42,109
+	Actor74: t05 42,107 42,107
+	Actor75: mine 61,81 61,81
+	Actor76: mine 17,54 17,54
+	Actor77: t05 97,26 97,26
+	Actor78: t10 96,28 96,28
+	Actor79: t08 98,30 98,30
+	Actor80: mine 92,20 92,20
+	Actor81: t08 74,28 74,28
+	Actor82: t05 74,26 74,26
+	Actor83: t10 75,25 75,25
+	Actor84: mine 57,101 57,101
+	Actor85: t13 88,88 88,88
+	Actor86: tc04 84,89 84,89
+	Actor87: tc01 86,88 86,88
+	Actor88: tc05 96,31 96,31
+	Actor89: tc01 96,30 96,30
+	Actor90: t16 96,29 96,29
+	Actor91: t16 97,29 97,29
+	Actor92: tc04 48,41 48,41
+	Actor93: tc01 46,37 46,37
+	Actor94: tc01 54,37 54,37
+	Actor95: tc01 53,38 53,38
+	Actor96: t17 55,39 55,39
+	Actor97: t16 48,34 48,34
+	Actor98: mine 90,110 90,110
+	Actor99: tc01 97,95 97,95
+	Actor100: mine 35,23 35,23
+	Actor101: t01 48,94 48,94
+	Actor102: t01 53,92 53,92
+	Actor103: t01 53,95 53,95
+	Actor104: t01 59,88 59,88
+	Actor105: t01 59,87 59,87
+	Actor106: t02 54,94 54,94
+	Actor107: t02 56,39 56,39
+	Actor108: t02 56,38 56,38
+	Actor109: t08 57,40 57,40
 
 Waypoints:
 	spawn0: 29,18
diff --git a/mods/ra/maps/caffeinated/preview.png b/mods/ra/maps/caffeinated/preview.png
index 50e7cf5454..4026319d8c 100644
Binary files a/mods/ra/maps/caffeinated/preview.png and b/mods/ra/maps/caffeinated/preview.png differ
diff --git a/mods/ra/maps/crossing/map.uid b/mods/ra/maps/crossing/map.uid
index 6f500f5638..c56c39f555 100644
--- a/mods/ra/maps/crossing/map.uid
+++ b/mods/ra/maps/crossing/map.uid
@@ -1 +1 @@
-dae5caba07d90ba598fab80a53d1604b8d2015be
\ No newline at end of file
+e4ec6fc0236cc1c163d006cefed738f44b672505
\ No newline at end of file
diff --git a/mods/ra/maps/crossing/map.yaml b/mods/ra/maps/crossing/map.yaml
index b89fe74492..75d8130264 100644
--- a/mods/ra/maps/crossing/map.yaml
+++ b/mods/ra/maps/crossing/map.yaml
@@ -6,7 +6,7 @@ Title: Crossing the River
 
 Author: Westwood Studios
 
-PlayerCount: 8
+PlayerCount: 6
 
 Tileset: TEMPERAT
 
@@ -17,70 +17,68 @@ TopLeft: 32,32
 BottomRight: 96,96
 
 Actors:
-	Actor0: v12 Neutral 90,32
-	Actor1: mine Neutral 41,71
-	Actor2: mine Neutral 36,63
-	Actor3: tc05 Neutral 37,66
-	Actor4: t15 Neutral 41,65
-	Actor5: tc04 Neutral 87,64
-	Actor6: tc01 Neutral 91,66
-	Actor7: t02 Neutral 92,65
-	Actor8: mine Neutral 92,63
-	Actor9: mine Neutral 87,69
-	Actor10: t03 Neutral 38,91
-	Actor11: t10 Neutral 40,93
-	Actor12: mine Neutral 36,83
-	Actor13: mine Neutral 53,78
-	Actor14: mine Neutral 48,88
-	Actor15: t10 Neutral 73,83
-	Actor16: t03 Neutral 72,82
-	Actor17: t13 Neutral 70,83
-	Actor18: mine Neutral 34,34
-	Actor19: mine Neutral 93,93
-	Actor20: tc02 Neutral 77,91
-	Actor21: t01 Neutral 80,92
-	Actor22: t06 Neutral 82,94
-	Actor23: t06 Neutral 83,93
-	Actor24: tc03 Neutral 49,32
-	Actor25: t08 Neutral 51,32
-	Actor26: t08 Neutral 48,33
-	Actor27: t08 Neutral 47,32
-	Actor28: t05 Neutral 46,32
-	Actor29: t02 Neutral 51,34
-	Actor30: t10 Neutral 39,42
-	Actor31: t11 Neutral 37,44
-	Actor32: t12 Neutral 37,42
-	Actor33: t12 Neutral 39,43
-	Actor34: t13 Neutral 43,41
-	Actor35: t15 Neutral 35,43
-	Actor36: t03 Neutral 34,44
-	Actor37: t03 Neutral 42,40
-	Actor38: t13 Neutral 88,34
-	Actor39: mine Neutral 93,45
-	Actor40: mine Neutral 75,46
-	Actor41: mine Neutral 85,55
-	Actor42: t13 Neutral 86,43
-	Actor43: t10 Neutral 87,45
-	Actor44: tc04 Neutral 79,45
-	Actor45: t07 Neutral 81,49
-	Actor46: t08 Neutral 80,51
-	Actor47: t08 Neutral 78,52
-	Actor48: tc02 Neutral 72,51
-	Actor49: tc01 Neutral 48,75
-	Actor50: t17 Neutral 43,77
-	Actor51: t03 Neutral 45,75
-	Actor52: t12 Neutral 45,80
-	Actor53: t12 Neutral 47,81
+	Actor0: v12 90,32 90,32
+	Actor1: mine 41,71 41,71
+	Actor2: mine 36,63 36,63
+	Actor3: tc05 37,66 37,66
+	Actor4: t15 41,65 41,65
+	Actor5: tc04 87,64 87,64
+	Actor6: tc01 91,66 91,66
+	Actor7: t02 92,65 92,65
+	Actor8: mine 92,63 92,63
+	Actor9: mine 87,69 87,69
+	Actor10: t03 38,91 38,91
+	Actor11: t10 40,93 40,93
+	Actor12: mine 36,83 36,83
+	Actor13: mine 53,78 53,78
+	Actor14: mine 48,88 48,88
+	Actor15: t10 73,83 73,83
+	Actor16: t03 72,82 72,82
+	Actor17: t13 70,83 70,83
+	Actor18: mine 34,34 34,34
+	Actor19: mine 93,93 93,93
+	Actor20: tc02 77,91 77,91
+	Actor21: t01 80,92 80,92
+	Actor22: t06 82,94 82,94
+	Actor23: t06 83,93 83,93
+	Actor24: tc03 49,32 49,32
+	Actor25: t08 51,32 51,32
+	Actor26: t08 48,33 48,33
+	Actor27: t08 47,32 47,32
+	Actor28: t05 46,32 46,32
+	Actor29: t02 51,34 51,34
+	Actor30: t10 39,42 39,42
+	Actor31: t11 37,44 37,44
+	Actor32: t12 37,42 37,42
+	Actor33: t12 39,43 39,43
+	Actor34: t13 43,41 43,41
+	Actor35: t15 35,43 35,43
+	Actor36: t03 34,44 34,44
+	Actor37: t03 42,40 42,40
+	Actor38: t13 88,34 88,34
+	Actor39: mine 93,45 93,45
+	Actor40: mine 75,46 75,46
+	Actor41: mine 85,55 85,55
+	Actor42: t13 86,43 86,43
+	Actor43: t10 87,45 87,45
+	Actor44: tc04 79,45 79,45
+	Actor45: t07 81,49 81,49
+	Actor46: t08 80,51 80,51
+	Actor47: t08 78,52 78,52
+	Actor48: tc02 72,51 72,51
+	Actor49: tc01 48,75 48,75
+	Actor50: t17 43,77 43,77
+	Actor51: t03 45,75 45,75
+	Actor52: t12 45,80 45,80
+	Actor53: t12 47,81 47,81
 
 Waypoints:
 	spawn0: 90,84
 	spawn1: 37,49
-	spawn2: 77,77
-	spawn3: 52,56
-	spawn4: 52,47
+	wp0: 44,55
 	spawn5: 91,76
 	spawn6: 85,79
-	spawn7: 46,51
+	wp1: 46,48
 
 Smudges:
 
diff --git a/mods/ra/maps/crossing/preview.png b/mods/ra/maps/crossing/preview.png
index 95f38fa9c5..e4d685a767 100644
Binary files a/mods/ra/maps/crossing/preview.png and b/mods/ra/maps/crossing/preview.png differ
diff --git a/mods/ra/maps/scm01ea/map.uid b/mods/ra/maps/scm01ea/map.uid
index b8d80a2248..91cd0350de 100644
--- a/mods/ra/maps/scm01ea/map.uid
+++ b/mods/ra/maps/scm01ea/map.uid
@@ -1 +1 @@
-d2d0811ce6cd64e836317039547ce777b5a199d3
\ No newline at end of file
+531bc417fc7e52621c40ae8dd461f4ce1527423c
\ No newline at end of file
diff --git a/mods/ra/maps/scm01ea/map.yaml b/mods/ra/maps/scm01ea/map.yaml
index 1d74e9dfae..2fca26fa8b 100644
--- a/mods/ra/maps/scm01ea/map.yaml
+++ b/mods/ra/maps/scm01ea/map.yaml
@@ -1,111 +1,113 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: Coastal Influence (4-6)
-
-Author: Westwood Studios
-
-PlayerCount: 8
-
-Tileset: SNOW
-
-MapSize: 128,128
-
-TopLeft: 13,18
-
-BottomRight: 107,112
-
-Actors:
-	Actor0: t08 Neutral 105,86
-	Actor1: t17 Neutral 106,85
-	Actor2: t12 Neutral 94,82
-	Actor3: tc03 Neutral 87,87
-	Actor4: tc04 Neutral 91,82
-	Actor5: tc05 Neutral 93,83
-	Actor6: tc05 Neutral 93,97
-	Actor7: tc03 Neutral 32,66
-	Actor8: t01 Neutral 14,30
-	Actor9: tc05 Neutral 33,31
-	Actor10: tc02 Neutral 90,30
-	Actor11: tc01 Neutral 91,28
-	Actor12: tc04 Neutral 38,69
-	Actor13: t02 Neutral 32,84
-	Actor14: t01 Neutral 28,89
-	Actor15: tc04 Neutral 13,40
-	Actor16: tc01 Neutral 18,40
-	Actor17: tc03 Neutral 30,45
-	Actor18: tc05 Neutral 26,53
-	Actor19: t03 Neutral 26,72
-	Actor20: t12 Neutral 34,77
-	Actor21: tc04 Neutral 45,75
-	Actor22: tc03 Neutral 15,20
-	Actor23: tc02 Neutral 22,18
-	Actor24: t07 Neutral 93,28
-	Actor25: t10 Neutral 68,37
-	Actor26: tc03 Neutral 97,46
-	Actor27: t01 Neutral 47,98
-	Actor28: tc03 Neutral 28,99
-	Actor29: tc04 Neutral 28,94
-	Actor30: tc02 Neutral 18,106
-	Actor31: tc01 Neutral 81,107
-	Actor32: t16 Neutral 105,109
-	Actor33: tc02 Neutral 105,110
-	Actor34: tc04 Neutral 13,96
-	Actor35: tc04 Neutral 15,73
-	Actor36: tc01 Neutral 16,74
-	Actor37: t16 Neutral 16,72
-	Actor38: t16 Neutral 61,54
-	Actor39: tc02 Neutral 84,54
-	Actor40: tc04 Neutral 104,53
-	Actor41: tc04 Neutral 14,86
-	Actor42: tc01 Neutral 13,88
-	Actor43: tc04 Neutral 15,34
-	Actor44: tc05 Neutral 84,40
-	Actor45: tc04 Neutral 80,48
-	Actor46: tc03 Neutral 87,45
-	Actor47: tc02 Neutral 78,42
-	Actor48: tc04 Neutral 25,46
-	Actor49: tc05 Neutral 33,46
-	Actor50: tc04 Neutral 43,62
-	Actor51: tc05 Neutral 44,63
-	Actor52: tc03 Neutral 41,64
-	Actor53: tc05 Neutral 104,71
-	Actor54: t01 Neutral 106,73
-	Actor55: t03 Neutral 104,72
-	Actor56: t12 Neutral 50,78
-	Actor57: tc02 Neutral 48,79
-	Actor58: tc02 Neutral 103,25
-	Actor59: tc01 Neutral 96,17
-	Actor60: tc03 Neutral 85,95
-	Actor61: tc04 Neutral 87,73
-	Actor62: t01 Neutral 78,64
-	Actor63: t15 Neutral 73,66
-	Actor64: tc01 Neutral 67,61
-	Actor65: t01 Neutral 21,45
-	Actor66: mine Neutral 50,94
-	Actor67: mine Neutral 102,57
-	Actor68: mine Neutral 97,107
-	Actor69: mine Neutral 100,21
-	Actor70: mine Neutral 37,22
-	Actor71: mine Neutral 21,70
-	Actor72: mine Neutral 19,90
-	Actor73: mine Neutral 53,55
-	Actor74: t01 Neutral 54,24
-	Actor75: t03 Neutral 78,21
-	Actor76: tc01 Neutral 55,35
-
-Waypoints:
-	spawn0: 24,26
-	spawn1: 101,35
-	spawn2: 100,92
-	spawn3: 25,102
-	spawn4: 61,83
-	spawn5: 63,44
-	spawn6: 19,52
-	spawn7: 95,65
-
-Smudges:
-
-Rules:
-
+Selectable: True
+
+MapFormat: 1
+
+Title: Coastal Influence
+
+Description:
+
+Author: Westwood Studios
+
+PlayerCount: 8
+
+Tileset: SNOW
+
+MapSize: 128,128
+
+TopLeft: 13,18
+
+BottomRight: 107,112
+
+Actors:
+	Actor0: t08 105,86 105,86
+	Actor1: t17 106,85 106,85
+	Actor2: t12 94,82 94,82
+	Actor3: tc03 87,87 87,87
+	Actor4: tc04 91,82 91,82
+	Actor5: tc05 93,83 93,83
+	Actor6: tc05 93,97 93,97
+	Actor7: tc03 32,66 32,66
+	Actor8: t01 14,30 14,30
+	Actor9: tc05 33,31 33,31
+	Actor10: tc02 90,30 90,30
+	Actor11: tc01 91,28 91,28
+	Actor12: tc04 38,69 38,69
+	Actor13: t02 32,84 32,84
+	Actor14: t01 28,89 28,89
+	Actor15: tc04 13,40 13,40
+	Actor16: tc01 18,40 18,40
+	Actor17: tc03 30,45 30,45
+	Actor18: tc05 26,53 26,53
+	Actor19: t03 26,72 26,72
+	Actor20: t12 34,77 34,77
+	Actor21: tc04 45,75 45,75
+	Actor22: tc03 15,20 15,20
+	Actor23: tc02 22,18 22,18
+	Actor24: t07 93,28 93,28
+	Actor25: t10 68,37 68,37
+	Actor26: tc03 97,46 97,46
+	Actor27: t01 47,98 47,98
+	Actor28: tc03 28,99 28,99
+	Actor29: tc04 28,94 28,94
+	Actor30: tc02 18,106 18,106
+	Actor31: tc01 81,107 81,107
+	Actor32: t16 105,109 105,109
+	Actor33: tc02 105,110 105,110
+	Actor34: tc04 13,96 13,96
+	Actor35: tc04 15,73 15,73
+	Actor36: tc01 16,74 16,74
+	Actor37: t16 16,72 16,72
+	Actor38: t16 61,54 61,54
+	Actor39: tc02 84,54 84,54
+	Actor40: tc04 104,53 104,53
+	Actor41: tc04 14,86 14,86
+	Actor42: tc01 13,88 13,88
+	Actor43: tc04 15,34 15,34
+	Actor44: tc05 84,40 84,40
+	Actor45: tc04 80,48 80,48
+	Actor46: tc03 87,45 87,45
+	Actor47: tc02 78,42 78,42
+	Actor48: tc04 25,46 25,46
+	Actor49: tc05 33,46 33,46
+	Actor50: tc04 43,62 43,62
+	Actor51: tc05 44,63 44,63
+	Actor52: tc03 41,64 41,64
+	Actor53: tc05 104,71 104,71
+	Actor54: t01 106,73 106,73
+	Actor55: t03 104,72 104,72
+	Actor56: t12 50,78 50,78
+	Actor57: tc02 48,79 48,79
+	Actor58: tc02 103,25 103,25
+	Actor59: tc01 96,17 96,17
+	Actor60: tc03 85,95 85,95
+	Actor61: tc04 87,73 87,73
+	Actor62: t01 78,64 78,64
+	Actor63: t15 73,66 73,66
+	Actor64: tc01 67,61 67,61
+	Actor65: t01 21,45 21,45
+	Actor66: mine 50,94 50,94
+	Actor67: mine 102,57 102,57
+	Actor68: mine 97,107 97,107
+	Actor69: mine 100,21 100,21
+	Actor70: mine 37,22 37,22
+	Actor71: mine 21,70 21,70
+	Actor72: mine 19,90 19,90
+	Actor73: mine 53,55 53,55
+	Actor74: t01 54,24 54,24
+	Actor75: t03 78,21 78,21
+	Actor76: tc01 55,35 55,35
+
+Waypoints:
+	spawn0: 24,26
+	spawn1: 101,35
+	spawn2: 100,92
+	spawn3: 25,102
+	spawn4: 61,83
+	spawn5: 63,44
+	spawn6: 19,52
+	spawn7: 95,65
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/scm01ea/preview.png b/mods/ra/maps/scm01ea/preview.png
index 20332f3e99..0d1ffedd97 100644
Binary files a/mods/ra/maps/scm01ea/preview.png and b/mods/ra/maps/scm01ea/preview.png differ
diff --git a/mods/ra/maps/scm02ea/map.uid b/mods/ra/maps/scm02ea/map.uid
index f0f52cd7b9..9e9440ebe1 100644
--- a/mods/ra/maps/scm02ea/map.uid
+++ b/mods/ra/maps/scm02ea/map.uid
@@ -1 +1 @@
-b3e0dbb967bc20a3e7da64e7383d2d90094684f0
\ No newline at end of file
+86aec43529a529708d1ac6c97d92e63ae8008663
\ No newline at end of file
diff --git a/mods/ra/maps/scm02ea/map.yaml b/mods/ra/maps/scm02ea/map.yaml
index b9d20bec1a..3f2789dc17 100644
--- a/mods/ra/maps/scm02ea/map.yaml
+++ b/mods/ra/maps/scm02ea/map.yaml
@@ -1,63 +1,65 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: Middle Mayhem (2)
-
-Author: Westwood Studios
-
-PlayerCount: 2
-
-Tileset: SNOW
-
-MapSize: 128,128
-
-TopLeft: 27,26
-
-BottomRight: 102,91
-
-Actors:
-	Actor0: tc05 Neutral 62,58
-	Actor1: tc04 Neutral 64,63
-	Actor2: tc03 Neutral 73,60
-	Actor3: tc03 Neutral 55,48
-	Actor4: tc01 Neutral 58,51
-	Actor5: tc01 Neutral 54,68
-	Actor6: t17 Neutral 60,68
-	Actor7: tc02 Neutral 48,57
-	Actor8: tc05 Neutral 68,63
-	Actor9: t16 Neutral 71,63
-	Actor10: t16 Neutral 70,55
-	Actor11: tc01 Neutral 83,57
-	Actor12: tc02 Neutral 62,54
-	Actor13: t08 Neutral 62,56
-	Actor14: t01 Neutral 49,80
-	Actor15: tc04 Neutral 50,81
-	Actor16: t16 Neutral 53,82
-	Actor17: tc02 Neutral 42,79
-	Actor18: tc03 Neutral 27,26
-	Actor19: t01 Neutral 29,48
-	Actor20: t02 Neutral 31,50
-	Actor21: t03 Neutral 32,59
-	Actor22: tc05 Neutral 56,88
-	Actor23: tc03 Neutral 54,89
-	Actor24: t16 Neutral 56,89
-	Actor25: t15 Neutral 52,89
-	Actor26: t14 Neutral 64,78
-	Actor27: tc01 Neutral 27,44
-	Actor28: tc01 Neutral 45,39
-	Actor29: t17 Neutral 76,26
-	Actor30: mine Neutral 68,53
-	Actor31: mine Neutral 54,57
-	Actor32: mine Neutral 53,65
-	Actor33: mine Neutral 65,68
-	Actor34: mine Neutral 80,61
-
-Waypoints:
-	spawn0: 34,84
-	spawn1: 35,34
-
-Smudges:
-
-Rules:
-
+Selectable: True
+
+MapFormat: 1
+
+Title: Middle Mayhem
+
+Description:
+
+Author: Westwood Studios
+
+PlayerCount: 2
+
+Tileset: SNOW
+
+MapSize: 128,128
+
+TopLeft: 27,26
+
+BottomRight: 102,91
+
+Actors:
+	Actor0: tc05 62,58 62,58
+	Actor1: tc04 64,63 64,63
+	Actor2: tc03 73,60 73,60
+	Actor3: tc03 55,48 55,48
+	Actor4: tc01 58,51 58,51
+	Actor5: tc01 54,68 54,68
+	Actor6: t17 60,68 60,68
+	Actor7: tc02 48,57 48,57
+	Actor8: tc05 68,63 68,63
+	Actor9: t16 71,63 71,63
+	Actor10: t16 70,55 70,55
+	Actor11: tc01 83,57 83,57
+	Actor12: tc02 62,54 62,54
+	Actor13: t08 62,56 62,56
+	Actor14: t01 49,80 49,80
+	Actor15: tc04 50,81 50,81
+	Actor16: t16 53,82 53,82
+	Actor17: tc02 42,79 42,79
+	Actor18: tc03 27,26 27,26
+	Actor19: t01 29,48 29,48
+	Actor20: t02 31,50 31,50
+	Actor21: t03 32,59 32,59
+	Actor22: tc05 56,88 56,88
+	Actor23: tc03 54,89 54,89
+	Actor24: t16 56,89 56,89
+	Actor25: t15 52,89 52,89
+	Actor26: t14 64,78 64,78
+	Actor27: tc01 27,44 27,44
+	Actor28: tc01 45,39 45,39
+	Actor29: t17 76,26 76,26
+	Actor30: mine 68,53 68,53
+	Actor31: mine 54,57 54,57
+	Actor32: mine 53,65 53,65
+	Actor33: mine 65,68 65,68
+	Actor34: mine 80,61 80,61
+
+Waypoints:
+	spawn0: 34,84
+	spawn1: 35,34
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/scm02ea/preview.png b/mods/ra/maps/scm02ea/preview.png
index 8d3d4015b4..38d3a46c72 100644
Binary files a/mods/ra/maps/scm02ea/preview.png and b/mods/ra/maps/scm02ea/preview.png differ
diff --git a/mods/ra/maps/scm03ea/map.uid b/mods/ra/maps/scm03ea/map.uid
index e0a0ca9e73..c78943a49a 100644
--- a/mods/ra/maps/scm03ea/map.uid
+++ b/mods/ra/maps/scm03ea/map.uid
@@ -1 +1 @@
-580c39f9606d773ea8daa2bf9603aa9687736be1
\ No newline at end of file
+4472d5d4fd2a9259bff5cbeb15d26c61922a54b5
\ No newline at end of file
diff --git a/mods/ra/maps/scm03ea/map.yaml b/mods/ra/maps/scm03ea/map.yaml
index eecad0556c..a259ee30b8 100644
--- a/mods/ra/maps/scm03ea/map.yaml
+++ b/mods/ra/maps/scm03ea/map.yaml
@@ -1,60 +1,62 @@
-Selectable: True
-
-MapFormat: 1
-
-Title: Equal Opportunity (2)
-
-Author: Westwood Studios
-
-PlayerCount: 5
-
-Tileset: SNOW
-
-MapSize: 128,128
-
-TopLeft: 28,26
-
-BottomRight: 99,97
-
-Actors:
-	Actor0: sbag Neutral 61,96
-	Actor1: tc03 Neutral 38,66
-	Actor2: tc03 Neutral 55,35
-	Actor3: tc02 Neutral 45,37
-	Actor4: tc03 Neutral 71,71
-	Actor5: tc02 Neutral 72,72
-	Actor6: t01 Neutral 61,62
-	Actor7: t03 Neutral 67,77
-	Actor8: t06 Neutral 53,87
-	Actor9: t10 Neutral 62,70
-	Actor10: t02 Neutral 66,51
-	Actor11: t05 Neutral 71,57
-	Actor12: tc01 Neutral 76,47
-	Actor13: t07 Neutral 81,53
-	Actor14: t12 Neutral 73,54
-	Actor15: t06 Neutral 69,56
-	Actor16: t11 Neutral 39,84
-	Actor17: t14 Neutral 77,32
-	Actor18: t12 Neutral 69,43
-	Actor19: tc02 Neutral 62,52
-	Actor20: tc03 Neutral 74,86
-	Actor21: tc05 Neutral 76,62
-	Actor22: tc04 Neutral 48,62
-	Actor23: mine Neutral 40,45
-	Actor24: mine Neutral 89,85
-	Actor25: mine Neutral 75,64
-	Actor26: mine Neutral 46,64
-	Actor27: mine Neutral 87,37
-	Actor28: mine Neutral 49,87
-
-Waypoints:
-	spawn0: 46,43
-	spawn1: 80,80
-	spawn2: 77,39
-	spawn3: 47,81
-	spawn4: 47,81
-
-Smudges:
-
-Rules:
-
+Selectable: True
+
+MapFormat: 1
+
+Title: Equal Opportunity
+
+Description:
+
+Author: Westwood Studios
+
+PlayerCount: 5
+
+Tileset: SNOW
+
+MapSize: 128,128
+
+TopLeft: 28,26
+
+BottomRight: 99,97
+
+Actors:
+	Actor0: sbag 61,96 61,96
+	Actor1: tc03 38,66 38,66
+	Actor2: tc03 55,35 55,35
+	Actor3: tc02 45,37 45,37
+	Actor4: tc03 71,71 71,71
+	Actor5: tc02 72,72 72,72
+	Actor6: t01 61,62 61,62
+	Actor7: t03 67,77 67,77
+	Actor8: t06 53,87 53,87
+	Actor9: t10 62,70 62,70
+	Actor10: t02 66,51 66,51
+	Actor11: t05 71,57 71,57
+	Actor12: tc01 76,47 76,47
+	Actor13: t07 81,53 81,53
+	Actor14: t12 73,54 73,54
+	Actor15: t06 69,56 69,56
+	Actor16: t11 39,84 39,84
+	Actor17: t14 77,32 77,32
+	Actor18: t12 69,43 69,43
+	Actor19: tc02 62,52 62,52
+	Actor20: tc03 74,86 74,86
+	Actor21: tc05 76,62 76,62
+	Actor22: tc04 48,62 48,62
+	Actor23: mine 40,45 40,45
+	Actor24: mine 89,85 89,85
+	Actor25: mine 75,64 75,64
+	Actor26: mine 46,64 46,64
+	Actor27: mine 87,37 87,37
+	Actor28: mine 49,87 49,87
+
+Waypoints:
+	spawn0: 46,43
+	spawn1: 80,80
+	spawn2: 77,39
+	spawn3: 47,81
+	spawn4: 47,81
+
+Smudges:
+
+Rules:
+
diff --git a/mods/ra/maps/scm03ea/preview.png b/mods/ra/maps/scm03ea/preview.png
index 0875f2bf40..891984cdeb 100644
Binary files a/mods/ra/maps/scm03ea/preview.png and b/mods/ra/maps/scm03ea/preview.png differ
diff --git a/mods/ra/maps/scm09ea/map.uid b/mods/ra/maps/scm09ea/map.uid
index d34cf748f8..d19a9488ca 100644
--- a/mods/ra/maps/scm09ea/map.uid
+++ b/mods/ra/maps/scm09ea/map.uid
@@ -1 +1 @@
-bc53e69ed95d602fb35730b9e18ea1a4deffad40
\ No newline at end of file
+4c986efc2890eee29599b38a01126034d4e3b26f
\ No newline at end of file
diff --git a/mods/ra/maps/scm09ea/map.yaml b/mods/ra/maps/scm09ea/map.yaml
index 38ae8a88b9..46d2df062d 100644
--- a/mods/ra/maps/scm09ea/map.yaml
+++ b/mods/ra/maps/scm09ea/map.yaml
@@ -2,7 +2,9 @@ Selectable: True
 
 MapFormat: 1
 
-Title: NORTH BY NORTHWEST (4-8)
+Title: North by Northwest
+
+Description:
 
 Author: Westwood Studios
 
@@ -17,84 +19,84 @@ TopLeft: 16,15
 BottomRight: 112,111
 
 Actors:
-	Actor0: mine Neutral 19,107
-	Actor1: mine Neutral 108,107
-	Actor2: mine Neutral 108,18
-	Actor3: mine Neutral 19,18
-	Actor4: tc04 Neutral 37,61
-	Actor5: tc03 Neutral 34,62
-	Actor6: tc03 Neutral 63,87
-	Actor7: tc02 Neutral 63,90
-	Actor8: tc02 Neutral 88,62
-	Actor9: tc01 Neutral 92,61
-	Actor10: t17 Neutral 91,62
-	Actor11: tc01 Neutral 63,37
-	Actor12: t16 Neutral 63,34
-	Actor13: tc02 Neutral 63,32
-	Actor14: t17 Neutral 64,35
-	Actor15: tc04 Neutral 32,88
-	Actor16: tc05 Neutral 34,91
-	Actor17: tc03 Neutral 31,93
-	Actor18: tc02 Neutral 31,30
-	Actor19: tc01 Neutral 35,31
-	Actor20: t14 Neutral 32,33
-	Actor21: t13 Neutral 35,34
-	Actor22: tc02 Neutral 94,29
-	Actor23: tc03 Neutral 90,32
-	Actor24: tc04 Neutral 92,33
-	Actor25: tc04 Neutral 101,22
-	Actor26: t16 Neutral 100,24
-	Actor27: tc02 Neutral 102,101
-	Actor28: t17 Neutral 101,99
-	Actor29: tc05 Neutral 93,93
-	Actor30: tc04 Neutral 91,89
-	Actor31: tc03 Neutral 94,91
-	Actor32: tc03 Neutral 24,101
-	Actor33: tc02 Neutral 24,23
-	Actor34: t17 Neutral 26,24
-	Actor35: mine Neutral 71,63
-	Actor36: mine Neutral 64,56
-	Actor37: mine Neutral 57,63
-	Actor38: mine Neutral 64,70
-	Actor39: t07 Neutral 42,40
-	Actor40: t07 Neutral 85,40
-	Actor41: t06 Neutral 85,83
-	Actor42: t01 Neutral 42,83
-	Actor43: t02 Neutral 52,58
-	Actor44: t03 Neutral 58,67
-	Actor45: t05 Neutral 69,55
-	Actor46: t06 Neutral 75,61
-	Actor47: t07 Neutral 60,52
-	Actor48: t08 Neutral 53,65
-	Actor49: t10 Neutral 60,73
-	Actor50: t12 Neutral 70,66
-	Actor51: t14 Neutral 69,58
-	Actor52: t16 Neutral 50,61
-	Actor53: t16 Neutral 68,71
-	Actor54: tc02 Neutral 35,86
-	Actor55: t17 Neutral 39,89
-	Actor56: tc01 Neutral 90,86
-	Actor57: t16 Neutral 87,89
-	Actor58: t15 Neutral 87,34
-	Actor59: t14 Neutral 91,38
-	Actor60: t14 Neutral 28,27
-	Actor61: t16 Neutral 29,96
-	Actor62: tc01 Neutral 98,95
-	Actor63: tc01 Neutral 95,31
-	Actor64: tc01 Neutral 50,42
-	Actor65: t17 Neutral 44,51
-	Actor66: t16 Neutral 45,46
-	Actor67: t15 Neutral 50,47
-	Actor68: t12 Neutral 46,79
-	Actor69: tc04 Neutral 49,81
-	Actor70: tc03 Neutral 45,75
-	Actor71: t17 Neutral 42,70
-	Actor72: tc03 Neutral 82,75
-	Actor73: tc05 Neutral 75,80
-	Actor74: tc03 Neutral 83,49
-	Actor75: tc01 Neutral 72,40
-	Actor76: t16 Neutral 76,45
-	Actor77: t14 Neutral 79,42
+	Actor0: mine 19,107 19,107
+	Actor1: mine 108,107 108,107
+	Actor2: mine 108,18 108,18
+	Actor3: mine 19,18 19,18
+	Actor4: tc04 37,61 37,61
+	Actor5: tc03 34,62 34,62
+	Actor6: tc03 63,87 63,87
+	Actor7: tc02 63,90 63,90
+	Actor8: tc02 88,62 88,62
+	Actor9: tc01 92,61 92,61
+	Actor10: t17 91,62 91,62
+	Actor11: tc01 63,37 63,37
+	Actor12: t16 63,34 63,34
+	Actor13: tc02 63,32 63,32
+	Actor14: t17 64,35 64,35
+	Actor15: tc04 32,88 32,88
+	Actor16: tc05 34,91 34,91
+	Actor17: tc03 31,93 31,93
+	Actor18: tc02 31,30 31,30
+	Actor19: tc01 35,31 35,31
+	Actor20: t14 32,33 32,33
+	Actor21: t13 35,34 35,34
+	Actor22: tc02 94,29 94,29
+	Actor23: tc03 90,32 90,32
+	Actor24: tc04 92,33 92,33
+	Actor25: tc04 101,22 101,22
+	Actor26: t16 100,24 100,24
+	Actor27: tc02 102,101 102,101
+	Actor28: t17 101,99 101,99
+	Actor29: tc05 93,93 93,93
+	Actor30: tc04 91,89 91,89
+	Actor31: tc03 94,91 94,91
+	Actor32: tc03 24,101 24,101
+	Actor33: tc02 24,23 24,23
+	Actor34: t17 26,24 26,24
+	Actor35: mine 71,63 71,63
+	Actor36: mine 64,56 64,56
+	Actor37: mine 57,63 57,63
+	Actor38: mine 64,70 64,70
+	Actor39: t07 42,40 42,40
+	Actor40: t07 85,40 85,40
+	Actor41: t06 85,83 85,83
+	Actor42: t01 42,83 42,83
+	Actor43: t02 52,58 52,58
+	Actor44: t03 58,67 58,67
+	Actor45: t05 69,55 69,55
+	Actor46: t06 75,61 75,61
+	Actor47: t07 60,52 60,52
+	Actor48: t08 53,65 53,65
+	Actor49: t10 60,73 60,73
+	Actor50: t12 70,66 70,66
+	Actor51: t14 69,58 69,58
+	Actor52: t16 50,61 50,61
+	Actor53: t16 68,71 68,71
+	Actor54: tc02 35,86 35,86
+	Actor55: t17 39,89 39,89
+	Actor56: tc01 90,86 90,86
+	Actor57: t16 87,89 87,89
+	Actor58: t15 87,34 87,34
+	Actor59: t14 91,38 91,38
+	Actor60: t14 28,27 28,27
+	Actor61: t16 29,96 29,96
+	Actor62: tc01 98,95 98,95
+	Actor63: tc01 95,31 95,31
+	Actor64: tc01 50,42 50,42
+	Actor65: t17 44,51 44,51
+	Actor66: t16 45,46 45,46
+	Actor67: t15 50,47 50,47
+	Actor68: t12 46,79 46,79
+	Actor69: tc04 49,81 49,81
+	Actor70: tc03 45,75 45,75
+	Actor71: t17 42,70 42,70
+	Actor72: tc03 82,75 82,75
+	Actor73: tc05 75,80 75,80
+	Actor74: tc03 83,49 83,49
+	Actor75: tc01 72,40 72,40
+	Actor76: t16 76,45 76,45
+	Actor77: t14 79,42 79,42
 
 Waypoints:
 	spawn0: 47,23
diff --git a/mods/ra/maps/scm09ea/preview.png b/mods/ra/maps/scm09ea/preview.png
index 9b2b34f037..b1de7d8b85 100644
Binary files a/mods/ra/maps/scm09ea/preview.png and b/mods/ra/maps/scm09ea/preview.png differ
diff --git a/mods/ra/maps/scm10ea/map.uid b/mods/ra/maps/scm10ea/map.uid
index 6a18c79491..e190dbc3ab 100644
--- a/mods/ra/maps/scm10ea/map.uid
+++ b/mods/ra/maps/scm10ea/map.uid
@@ -1 +1 @@
-e5e14175e30472174b3763b90fc94ffb95054a66
\ No newline at end of file
+276392458aaf0409db0cbed2d98e58a69be67b3d
\ No newline at end of file
diff --git a/mods/ra/maps/scm10ea/map.yaml b/mods/ra/maps/scm10ea/map.yaml
index 58f55a7468..a5fa3080dc 100644
--- a/mods/ra/maps/scm10ea/map.yaml
+++ b/mods/ra/maps/scm10ea/map.yaml
@@ -2,7 +2,9 @@ Selectable: True
 
 MapFormat: 1
 
-Title: first come first serve (4)
+Title: First Come, First Served
+
+Description:
 
 Author: Westwood Studios
 
@@ -17,37 +19,37 @@ TopLeft: 22,22
 BottomRight: 106,106
 
 Actors:
-	Actor0: mine Neutral 40,92
-	Actor1: mine Neutral 89,35
-	Actor2: mine Neutral 64,64
-	Actor3: tc05 Neutral 43,87
-	Actor4: tc04 Neutral 42,75
-	Actor5: tc02 Neutral 57,75
-	Actor6: tc02 Neutral 62,86
-	Actor7: tc04 Neutral 64,38
-	Actor8: tc04 Neutral 84,29
-	Actor9: tc02 Neutral 96,40
-	Actor10: tc03 Neutral 66,79
-	Actor11: tc02 Neutral 54,88
-	Actor12: tc01 Neutral 41,80
-	Actor13: tc04 Neutral 52,29
-	Actor14: tc03 Neutral 94,30
-	Actor15: tc05 Neutral 39,95
-	Actor16: t17 Neutral 35,87
-	Actor17: tc05 Neutral 68,50
-	Actor18: mine Neutral 74,45
-	Actor19: mine Neutral 52,81
-	Actor20: tc03 Neutral 86,94
-	Actor21: tc04 Neutral 32,29
-	Actor22: tc01 Neutral 42,57
-	Actor23: tc03 Neutral 83,45
-	Actor24: tc03 Neutral 89,79
-	Actor25: tc01 Neutral 81,78
-	Actor26: t16 Neutral 37,45
-	Actor27: tc04 Neutral 64,30
-	Actor28: tc01 Neutral 77,39
-	Actor29: t16 Neutral 73,54
-	Actor30: t16 Neutral 37,90
+	Actor0: mine 40,92 40,92
+	Actor1: mine 89,35 89,35
+	Actor2: mine 64,64 64,64
+	Actor3: tc05 43,87 43,87
+	Actor4: tc04 42,75 42,75
+	Actor5: tc02 57,75 57,75
+	Actor6: tc02 62,86 62,86
+	Actor7: tc04 64,38 64,38
+	Actor8: tc04 84,29 84,29
+	Actor9: tc02 96,40 96,40
+	Actor10: tc03 66,79 66,79
+	Actor11: tc02 54,88 54,88
+	Actor12: tc01 41,80 41,80
+	Actor13: tc04 52,29 52,29
+	Actor14: tc03 94,30 94,30
+	Actor15: tc05 39,95 39,95
+	Actor16: t17 35,87 35,87
+	Actor17: tc05 68,50 68,50
+	Actor18: mine 74,45 74,45
+	Actor19: mine 52,81 52,81
+	Actor20: tc03 86,94 86,94
+	Actor21: tc04 32,29 32,29
+	Actor22: tc01 42,57 42,57
+	Actor23: tc03 83,45 83,45
+	Actor24: tc03 89,79 89,79
+	Actor25: tc01 81,78 81,78
+	Actor26: t16 37,45 37,45
+	Actor27: tc04 64,30 64,30
+	Actor28: tc01 77,39 77,39
+	Actor29: t16 73,54 73,54
+	Actor30: t16 37,90 37,90
 
 Waypoints:
 	spawn0: 40,67
diff --git a/mods/ra/maps/scm10ea/preview.png b/mods/ra/maps/scm10ea/preview.png
index cf56eb6f83..c8c0fde91e 100644
Binary files a/mods/ra/maps/scm10ea/preview.png and b/mods/ra/maps/scm10ea/preview.png differ
diff --git a/mods/ra/maps/scm11ea/map.uid b/mods/ra/maps/scm11ea/map.uid
index 88069a6460..8d966de1ca 100644
--- a/mods/ra/maps/scm11ea/map.uid
+++ b/mods/ra/maps/scm11ea/map.uid
@@ -1 +1 @@
-97dbcf90ac8ebea32902ac5b42f67214f40123dd
\ No newline at end of file
+4104acf0819ec740a1073976704a35e74014f4de
\ No newline at end of file
diff --git a/mods/ra/maps/scm11ea/map.yaml b/mods/ra/maps/scm11ea/map.yaml
index 60a53dbb9a..c0e36aa11b 100644
--- a/mods/ra/maps/scm11ea/map.yaml
+++ b/mods/ra/maps/scm11ea/map.yaml
@@ -2,7 +2,9 @@ Selectable: True
 
 MapFormat: 1
 
-Title: Island hoppers (4)
+Title: Island Hoppers
+
+Description:
 
 Author: Westwood Studios
 
@@ -17,33 +19,33 @@ TopLeft: 11,19
 BottomRight: 107,115
 
 Actors:
-	Actor0: t01 Neutral 62,77
-	Actor1: tc01 Neutral 61,80
-	Actor2: t08 Neutral 59,76
-	Actor3: tc05 Neutral 53,99
-	Actor4: tc05 Neutral 18,68
-	Actor5: tc05 Neutral 59,34
-	Actor6: tc04 Neutral 98,68
-	Actor7: tc04 Neutral 39,24
-	Actor8: tc04 Neutral 80,105
-	Actor9: tc03 Neutral 41,105
-	Actor10: tc02 Neutral 18,80
-	Actor11: tc02 Neutral 57,23
-	Actor12: tc01 Neutral 98,81
-	Actor13: t17 Neutral 97,50
-	Actor14: t16 Neutral 67,101
-	Actor15: t15 Neutral 31,103
-	Actor16: t14 Neutral 21,48
-	Actor17: t11 Neutral 62,26
-	Actor18: t10 Neutral 93,66
-	Actor19: mine Neutral 44,59
-	Actor20: mine Neutral 87,48
-	Actor21: mine Neutral 84,89
-	Actor22: mine Neutral 45,86
-	Actor23: mine Neutral 70,26
-	Actor24: mine Neutral 66,103
-	Actor25: mine Neutral 46,102
-	Actor26: mine Neutral 50,31
+	Actor0: t01 62,77 62,77
+	Actor1: tc01 61,80 61,80
+	Actor2: t08 59,76 59,76
+	Actor3: tc05 53,99 53,99
+	Actor4: tc05 18,68 18,68
+	Actor5: tc05 59,34 59,34
+	Actor6: tc04 98,68 98,68
+	Actor7: tc04 39,24 39,24
+	Actor8: tc04 80,105 80,105
+	Actor9: tc03 41,105 41,105
+	Actor10: tc02 18,80 18,80
+	Actor11: tc02 57,23 57,23
+	Actor12: tc01 98,81 98,81
+	Actor13: t17 97,50 97,50
+	Actor14: t16 67,101 67,101
+	Actor15: t15 31,103 31,103
+	Actor16: t14 21,48 21,48
+	Actor17: t11 62,26 62,26
+	Actor18: t10 93,66 93,66
+	Actor19: mine 44,59 44,59
+	Actor20: mine 87,48 87,48
+	Actor21: mine 84,89 84,89
+	Actor22: mine 45,86 45,86
+	Actor23: mine 70,26 70,26
+	Actor24: mine 66,103 66,103
+	Actor25: mine 46,102 46,102
+	Actor26: mine 50,31 50,31
 
 Waypoints:
 	spawn0: 41,53
diff --git a/mods/ra/maps/scm11ea/preview.png b/mods/ra/maps/scm11ea/preview.png
index cb9cff1919..d0b6b9aa0e 100644
Binary files a/mods/ra/maps/scm11ea/preview.png and b/mods/ra/maps/scm11ea/preview.png differ
diff --git a/mods/ra/maps/scm12ea/map.uid b/mods/ra/maps/scm12ea/map.uid
index b6c88a2c01..e3ad678b4a 100644
--- a/mods/ra/maps/scm12ea/map.uid
+++ b/mods/ra/maps/scm12ea/map.uid
@@ -1 +1 @@
-69a3a157788e9c2c52a9ead3bf6a8e890134fc5a
\ No newline at end of file
+84f76e69d4957aae51a850d59eb5d4f6ba11e484
\ No newline at end of file
diff --git a/mods/ra/maps/scm12ea/map.yaml b/mods/ra/maps/scm12ea/map.yaml
index 66032643b6..265402fb3e 100644
--- a/mods/ra/maps/scm12ea/map.yaml
+++ b/mods/ra/maps/scm12ea/map.yaml
@@ -2,7 +2,9 @@ Selectable: True
 
 MapFormat: 1
 
-Title: raraku (4-8)
+Title: Raraku
+
+Description:
 
 Author: Westwood Studios
 
@@ -17,77 +19,77 @@ TopLeft: 15,15
 BottomRight: 111,111
 
 Actors:
-	Actor0: tc04 Neutral 57,17
-	Actor1: tc05 Neutral 61,22
-	Actor2: tc03 Neutral 55,25
-	Actor3: tc02 Neutral 65,16
-	Actor4: t17 Neutral 62,18
-	Actor5: tc04 Neutral 51,14
-	Actor6: tc03 Neutral 68,29
-	Actor7: tc01 Neutral 58,29
-	Actor8: tc05 Neutral 50,38
-	Actor9: tc02 Neutral 45,30
-	Actor10: tc05 Neutral 97,16
-	Actor11: tc04 Neutral 96,15
-	Actor12: tc03 Neutral 96,24
-	Actor13: tc05 Neutral 26,30
-	Actor14: tc04 Neutral 15,28
-	Actor15: tc05 Neutral 16,29
-	Actor16: tc03 Neutral 25,32
-	Actor17: tc04 Neutral 23,92
-	Actor18: tc05 Neutral 24,93
-	Actor19: tc03 Neutral 96,90
-	Actor20: tc05 Neutral 96,76
-	Actor21: tc01 Neutral 86,77
-	Actor22: t16 Neutral 90,80
-	Actor23: tc02 Neutral 37,86
-	Actor24: t17 Neutral 80,56
-	Actor25: tc02 Neutral 76,66
-	Actor26: tc04 Neutral 56,61
-	Actor27: tc05 Neutral 52,59
-	Actor28: tc03 Neutral 30,49
-	Actor29: tc02 Neutral 25,69
-	Actor30: t16 Neutral 34,72
-	Actor31: tc03 Neutral 42,54
-	Actor32: mine Neutral 73,79
-	Actor33: mine Neutral 49,34
-	Actor34: mine Neutral 105,22
-	Actor35: mine Neutral 101,80
-	Actor36: mine Neutral 43,107
-	Actor37: mine Neutral 24,47
-	Actor38: tc01 Neutral 84,90
-	Actor39: t16 Neutral 83,91
-	Actor40: tc02 Neutral 18,101
-	Actor41: tc01 Neutral 17,107
-	Actor42: t16 Neutral 15,95
-	Actor43: tc04 Neutral 17,16
-	Actor44: tc01 Neutral 42,28
-	Actor45: tc05 Neutral 79,31
-	Actor46: tc03 Neutral 109,15
-	Actor47: tc02 Neutral 107,15
-	Actor48: tc02 Neutral 105,33
-	Actor49: tc02 Neutral 104,32
-	Actor50: tc04 Neutral 45,85
-	Actor51: tc05 Neutral 75,97
-	Actor52: t16 Neutral 76,99
-	Actor53: tc01 Neutral 88,89
-	Actor54: tc02 Neutral 35,91
-	Actor55: tc01 Neutral 39,31
-	Actor56: tc03 Neutral 14,59
-	Actor57: tc02 Neutral 15,57
-	Actor58: tc01 Neutral 21,14
-	Actor59: mine Neutral 74,62
-	Actor60: mine Neutral 43,21
-	Actor61: tc02 Neutral 36,109
-	Actor62: tc01 Neutral 109,44
-	Actor63: tc02 Neutral 98,38
-	Actor64: tc03 Neutral 72,69
-	Actor65: tc01 Neutral 89,14
-	Actor66: tc04 Neutral 81,47
-	Actor67: tc01 Neutral 100,94
-	Actor68: tc02 Neutral 102,86
-	Actor69: tc05 Neutral 89,54
-	Actor70: tc01 Neutral 89,53
+	Actor0: tc04 57,17 57,17
+	Actor1: tc05 61,22 61,22
+	Actor2: tc03 55,25 55,25
+	Actor3: tc02 65,16 65,16
+	Actor4: t17 62,18 62,18
+	Actor5: tc04 51,14 51,14
+	Actor6: tc03 68,29 68,29
+	Actor7: tc01 58,29 58,29
+	Actor8: tc05 50,38 50,38
+	Actor9: tc02 45,30 45,30
+	Actor10: tc05 97,16 97,16
+	Actor11: tc04 96,15 96,15
+	Actor12: tc03 96,24 96,24
+	Actor13: tc05 26,30 26,30
+	Actor14: tc04 15,28 15,28
+	Actor15: tc05 16,29 16,29
+	Actor16: tc03 25,32 25,32
+	Actor17: tc04 23,92 23,92
+	Actor18: tc05 24,93 24,93
+	Actor19: tc03 96,90 96,90
+	Actor20: tc05 96,76 96,76
+	Actor21: tc01 86,77 86,77
+	Actor22: t16 90,80 90,80
+	Actor23: tc02 37,86 37,86
+	Actor24: t17 80,56 80,56
+	Actor25: tc02 76,66 76,66
+	Actor26: tc04 56,61 56,61
+	Actor27: tc05 52,59 52,59
+	Actor28: tc03 30,49 30,49
+	Actor29: tc02 25,69 25,69
+	Actor30: t16 34,72 34,72
+	Actor31: tc03 42,54 42,54
+	Actor32: mine 73,79 73,79
+	Actor33: mine 49,34 49,34
+	Actor34: mine 105,22 105,22
+	Actor35: mine 101,80 101,80
+	Actor36: mine 43,107 43,107
+	Actor37: mine 24,47 24,47
+	Actor38: tc01 84,90 84,90
+	Actor39: t16 83,91 83,91
+	Actor40: tc02 18,101 18,101
+	Actor41: tc01 17,107 17,107
+	Actor42: t16 15,95 15,95
+	Actor43: tc04 17,16 17,16
+	Actor44: tc01 42,28 42,28
+	Actor45: tc05 79,31 79,31
+	Actor46: tc03 109,15 109,15
+	Actor47: tc02 107,15 107,15
+	Actor48: tc02 105,33 105,33
+	Actor49: tc02 104,32 104,32
+	Actor50: tc04 45,85 45,85
+	Actor51: tc05 75,97 75,97
+	Actor52: t16 76,99 76,99
+	Actor53: tc01 88,89 88,89
+	Actor54: tc02 35,91 35,91
+	Actor55: tc01 39,31 39,31
+	Actor56: tc03 14,59 14,59
+	Actor57: tc02 15,57 15,57
+	Actor58: tc01 21,14 21,14
+	Actor59: mine 74,62 74,62
+	Actor60: mine 43,21 43,21
+	Actor61: tc02 36,109 36,109
+	Actor62: tc01 109,44 109,44
+	Actor63: tc02 98,38 98,38
+	Actor64: tc03 72,69 72,69
+	Actor65: tc01 89,14 89,14
+	Actor66: tc04 81,47 81,47
+	Actor67: tc01 100,94 100,94
+	Actor68: tc02 102,86 102,86
+	Actor69: tc05 89,54 89,54
+	Actor70: tc01 89,53 89,53
 
 Waypoints:
 	spawn0: 26,102
diff --git a/mods/ra/maps/scm12ea/preview.png b/mods/ra/maps/scm12ea/preview.png
index 5bff09100b..9b3e3dffed 100644
Binary files a/mods/ra/maps/scm12ea/preview.png and b/mods/ra/maps/scm12ea/preview.png differ
diff --git a/mods/ra/maps/snowyridge/map.uid b/mods/ra/maps/snowyridge/map.uid
index 2478351983..d8d5d653db 100644
--- a/mods/ra/maps/snowyridge/map.uid
+++ b/mods/ra/maps/snowyridge/map.uid
@@ -1 +1 @@
-9efe6575cc1dd2724247ffdc3b812d4d84ecff0c
\ No newline at end of file
+eb86567c36a51a6a0c4402932c3d4147307e6232
\ No newline at end of file
diff --git a/mods/ra/maps/snowyridge/map.yaml b/mods/ra/maps/snowyridge/map.yaml
index 9f73833439..2b2f13cf1b 100644
--- a/mods/ra/maps/snowyridge/map.yaml
+++ b/mods/ra/maps/snowyridge/map.yaml
@@ -2,13 +2,13 @@ Selectable: True
 
 MapFormat: 1
 
-Title: Snowy Ridge (2-3)
+Title: Snowy Ridge
 
 Description: Free-for-all deathmatch in the snow
 
 Author: Chris Forbes
 
-PlayerCount: 8
+PlayerCount: 3
 
 Tileset: SNOW
 
@@ -19,38 +19,38 @@ TopLeft: 14,19
 BottomRight: 60,60
 
 Actors:
-	Actor0: tc02 Neutral 25,39
-	Actor1: tc01 Neutral 26,40
-	Actor2: tc01 Neutral 27,39
-	Actor3: tc05 Neutral 30,40
-	Actor4: tc04 Neutral 37,39
-	Actor5: tc04 Neutral 39,37
-	Actor6: tc04 Neutral 41,35
-	Actor7: t01 Neutral 42,33
-	Actor8: t01 Neutral 50,24
-	Actor9: t05 Neutral 49,25
-	Actor10: t08 Neutral 45,29
-	Actor11: tc04 Neutral 43,49
-	Actor12: tc01 Neutral 45,51
-	Actor13: tc01 Neutral 48,52
-	Actor14: t03 Neutral 40,42
-	Actor15: t03 Neutral 35,40
-	Actor16: tc04 Neutral 57,57
-	Actor17: tc02 Neutral 58,19
-	Actor18: tc01 Neutral 21,19
-	Actor19: tc02 Neutral 19,20
-	Actor20: t08 Neutral 16,22
-	Actor21: v12 Neutral 18,22
-	Actor22: t05 Neutral 18,55
-	Actor23: tc02 Neutral 16,54
-	Actor24: t16 Neutral 29,39
-	Actor25: t16 Neutral 21,56
-	Actor26: mine Neutral 33,45
-	Actor27: mine Neutral 36,45
-	Actor28: mine Neutral 44,43
-	Actor29: mine Neutral 45,40
-	Actor30: mine Neutral 37,34
-	Actor31: mine Neutral 35,37
+	Actor0: tc02 25,39 25,39
+	Actor1: tc01 26,40 26,40
+	Actor2: tc01 27,39 27,39
+	Actor3: tc05 30,40 30,40
+	Actor4: tc04 37,39 37,39
+	Actor5: tc04 39,37 39,37
+	Actor6: tc04 41,35 41,35
+	Actor7: t01 42,33 42,33
+	Actor8: t01 50,24 50,24
+	Actor9: t05 49,25 49,25
+	Actor10: t08 45,29 45,29
+	Actor11: tc04 43,49 43,49
+	Actor12: tc01 45,51 45,51
+	Actor13: tc01 48,52 48,52
+	Actor14: t03 40,42 40,42
+	Actor15: t03 35,40 35,40
+	Actor16: tc04 57,57 57,57
+	Actor17: tc02 58,19 58,19
+	Actor18: tc01 21,19 21,19
+	Actor19: tc02 19,20 19,20
+	Actor20: t08 16,22 16,22
+	Actor21: v12 18,22 18,22
+	Actor22: t05 18,55 18,55
+	Actor23: tc02 16,54 16,54
+	Actor24: t16 29,39 29,39
+	Actor25: t16 21,56 21,56
+	Actor26: mine 33,45 33,45
+	Actor27: mine 36,45 36,45
+	Actor28: mine 44,43 44,43
+	Actor29: mine 45,40 45,40
+	Actor30: mine 37,34 37,34
+	Actor31: mine 35,37 35,37
 
 Waypoints:
 	wp0: 29,24