diff --git a/wadsrc/static/mapinfo/chex.txt b/wadsrc/static/mapinfo/chex.txt
index cdd9aa7129..52347257b4 100644
--- a/wadsrc/static/mapinfo/chex.txt
+++ b/wadsrc/static/mapinfo/chex.txt
@@ -53,16 +53,20 @@ episode e1m1
 	key = "k"
 }
 
+defaultmap
+{
+	sucktime = 1
+}
+
 map E1M1 lookup "CHUSTR_E1M1"
 {
 	levelnum = 1
 	titlepatch = "WILV00"
 	next = "E1M2"
 	secretnext = "E1M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	par = 30
-	sucktime = 1
 	music = "$MUSIC_E1M1"
 }
 
@@ -72,10 +76,9 @@ map E1M2 lookup "CHUSTR_E1M2"
 	titlepatch = "WILV01"
 	next = "E1M3"
 	secretnext = "E1M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	par = 75
-	sucktime = 1
 	music = "$MUSIC_E1M2"
 }
 
@@ -85,10 +88,9 @@ map E1M3 lookup "CHUSTR_E1M3"
 	titlepatch = "WILV02"
 	next = "E1M4"
 	secretnext = "E1M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	par = 120
-	sucktime = 1
 	music = "$MUSIC_E1M3"
 }
 
@@ -98,10 +100,9 @@ map E1M4 lookup "CHUSTR_E1M4"
 	titlepatch = "WILV03"
 	next = "E1M5"
 	secretnext = "E1M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	par = 90
-	sucktime = 1
 	music = "$MUSIC_E1M4"
 }
 
@@ -111,12 +112,10 @@ map E1M5 lookup "CHUSTR_E1M5"
 	titlepatch = "WILV04"
 	next = "EndGame1"
 	secretnext = "E1M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	par = 165
-	sucktime = 1
 	music = "$MUSIC_E1M5"
-
 }
 
 // Clusters (correspond with same-numbered episode)
diff --git a/wadsrc/static/mapinfo/doom1.txt b/wadsrc/static/mapinfo/doom1.txt
index 0d5e78d299..6ffc2777ae 100644
--- a/wadsrc/static/mapinfo/doom1.txt
+++ b/wadsrc/static/mapinfo/doom1.txt
@@ -1,544 +1,513 @@
-// MAPINFO for Doom 1 (Shareware, Registered, and Retail)

-clearepisodes
-episode e1m1
-{
-	picname = "M_EPI1"
-	key = "k"
-}
-
-episode e2m1
-{
-	picname = "M_EPI2"
-	key = "t"
-}
-
-episode e3m1
-{
-	picname = "M_EPI3"
-	key = "i"
-}
-
-episode e4m1
-{
-	picname = "M_EPI4"
-	key = "t"
-	optional
-
-}
-
-// Registered/Retail Episode 1
-
-map E1M1 lookup "HUSTR_E1M1"
-{
-	levelnum = 1
-	titlepatch = "WILV00"
-	next = "E1M2"
-	secretnext = "E1M9"
-	sky1 = "SKY1", 0
-	cluster = 1
-	par = 30
-	sucktime = 1
-	music = "$MUSIC_E1M1"
-}
-
-map E1M2 lookup "HUSTR_E1M2"
-{
-	levelnum = 2
-	titlepatch = "WILV01"
-	next = "E1M3"
-	secretnext = "E1M9"
-	sky1 = "SKY1", 0
-	cluster = 1
-	par = 75
-	sucktime = 1
-	music = "$MUSIC_E1M2"
-}
-
-map E1M3 lookup "HUSTR_E1M3"
-{
-	levelnum = 3
-	titlepatch = "WILV02"
-	next = "E1M4"
-	secretnext = "E1M9"
-	sky1 = "SKY1", 0
-	cluster = 1
-	par = 120
-	sucktime = 1
-	music = "$MUSIC_E1M3"
-}
-
-map E1M4 lookup "HUSTR_E1M4"
-{
-	levelnum = 4
-	titlepatch = "WILV03"
-	next = "E1M5"
-	secretnext = "E1M9"
-	sky1 = "SKY1", 0
-	cluster = 1
-	par = 90
-	sucktime = 1
-	music = "$MUSIC_E1M4"
-}
-
-map E1M5 lookup "HUSTR_E1M5"
-{
-	levelnum = 5
-	titlepatch = "WILV04"
-	next = "E1M6"
-	secretnext = "E1M9"
-	sky1 = "SKY1", 0
-	cluster = 1
-	par = 165
-	sucktime = 1
-	music = "$MUSIC_E1M5"
-}
-
-map E1M6 lookup "HUSTR_E1M6"
-{
-	levelnum = 6
-	titlepatch = "WILV05"
-	next = "E1M7"
-	secretnext = "E1M9"
-	sky1 = "SKY1", 0
-	cluster = 1
-	par = 180
-	sucktime = 1
-	music = "$MUSIC_E1M6"
-}
-
-map E1M7 lookup "HUSTR_E1M7"
-{
-	levelnum = 7
-	titlepatch = "WILV06"
-	next = "E1M8"
-	secretnext = "E1M9"
-	sky1 = "SKY1", 0
-	cluster = 1
-	par = 180
-	sucktime = 1
-	music = "$MUSIC_E1M7"
-}
-
-map E1M8 lookup "HUSTR_E1M8"
-{
-	levelnum = 8
-	titlepatch = "WILV07"
-	next = "EndGame1"
-	secretnext = "E1M9"
-	sky1 = "SKY1", 0
-	cluster = 1
-	par = 30
-	nointermission
-	nosoundclipping
-	baronspecial
-	specialaction_lowerfloor
-	sucktime = 1
-	music = "$MUSIC_E1M8"
-}
-
-map E1M9 lookup "HUSTR_E1M9"
-{
-	levelnum = 9
-	titlepatch = "WILV08"
-	next = "E1M4"
-	secretnext = "E1M4"
-	sky1 = "SKY1", 0
-	cluster = 1
-	par = 165
-	sucktime = 1
-	music = "$MUSIC_E1M9"
-}
-
-// Registered/Retail Episode 2
-
-map E2M1 lookup "HUSTR_E2M1"
-{
-	levelnum = 11
-	titlepatch = "WILV10"
-	next = "E2M2"
-	secretnext = "E2M9"
-	sky1 = "SKY2", 0
-	cluster = 2
-	par = 90
-	sucktime = 1
-	music = "$MUSIC_E2M1"
-}
-
-map E2M2 lookup "HUSTR_E2M2"
-{
-	levelnum = 12
-	titlepatch = "WILV11"
-	next = "E2M3"
-	secretnext = "E2M9"
-	sky1 = "SKY2", 0
-	cluster = 2
-	par = 90
-	sucktime = 1
-	music = "$MUSIC_E2M2"
-}
-
-map E2M3 lookup "HUSTR_E2M3"
-{
-	levelnum = 13
-	titlepatch = "WILV12"
-	next = "E2M4"
-	secretnext = "E2M9"
-	sky1 = "SKY2", 0
-	cluster = 2
-	par = 90
-	sucktime = 1
-	music = "$MUSIC_E2M3"
-}
-
-map E2M4 lookup "HUSTR_E2M4"
-{
-	levelnum = 14
-	titlepatch = "WILV13"
-	next = "E2M5"
-	secretnext = "E2M9"
-	sky1 = "SKY2", 0
-	cluster = 2
-	par = 120
-	sucktime = 1
-	music = "$MUSIC_E2M4"
-}
-
-map E2M5 lookup "HUSTR_E2M5"
-{
-	levelnum = 15
-	titlepatch = "WILV14"
-	next = "E2M6"
-	secretnext = "E2M9"
-	sky1 = "SKY2", 0
-	cluster = 2
-	par = 90
-	sucktime = 1
-	music = "$MUSIC_E2M5"
-}
-
-map E2M6 lookup "HUSTR_E2M6"
-{
-	levelnum = 16
-	titlepatch = "WILV15"
-	next = "E2M7"
-	secretnext = "E2M9"
-	sky1 = "SKY2", 0
-	cluster = 2
-	par = 360
-	sucktime = 1
-	music = "$MUSIC_E2M6"
-}
-
-map E2M7 lookup "HUSTR_E2M7"
-{
-	levelnum = 17
-	titlepatch = "WILV16"
-	next = "E2M8"
-	secretnext = "E2M9"
-	sky1 = "SKY2", 0
-	cluster = 2
-	par = 240
-	sucktime = 1
-	music = "$MUSIC_E2M7"
-}
-
-map E2M8 lookup "HUSTR_E2M8"
-{
-	levelnum = 18
-	titlepatch = "WILV17"
-	next = "EndGame2"
-	secretnext = "E2M9"
-	sky1 = "SKY2", 0
-	cluster = 2
-	par = 30
-	nointermission
-	nosoundclipping
-	cyberdemonspecial
-	specialaction_exitlevel
-	sucktime = 1
-	music = "$MUSIC_E2M8"
-}
-
-map E2M9 lookup "HUSTR_E2M9"
-{
-	levelnum = 19
-	titlepatch = "WILV18"
-	next = "E2M6"
-	secretnext = "E2M6"
-	sky1 = "SKY2", 0
-	cluster = 2
-	par = 170
-	sucktime = 1
-	music = "$MUSIC_E2M9"
-}
-
-// Registered/Retail Episode 3
-
-map E3M1 lookup "HUSTR_E3M1"
-{
-	levelnum = 21
-	titlepatch = "WILV20"
-	next = "E3M2"
-	secretnext = "E3M9"
-	sky1 = "SKY3", 0
-	cluster = 3
-	par = 90
-	sucktime = 1
-	music = "$MUSIC_E3M1"
-}
-
-map E3M2 lookup "HUSTR_E3M2"
-{
-	levelnum = 22
-	titlepatch = "WILV21"
-	next = "E3M3"
-	secretnext = "E3M9"
-	sky1 = "SKY3", 0
-	cluster = 3
-	par = 45
-	sucktime = 1
-	music = "$MUSIC_E3M2"
-}
-
-map E3M3 lookup "HUSTR_E3M3"
-{
-	levelnum = 23
-	titlepatch = "WILV22"
-	next = "E3M4"
-	secretnext = "E3M9"
-	sky1 = "SKY3", 0
-	cluster = 3
-	par = 90
-	sucktime = 1
-	music = "$MUSIC_E3M3"
-}
-
-map E3M4 lookup "HUSTR_E3M4"
-{
-	levelnum = 24
-	titlepatch = "WILV23"
-	next = "E3M5"
-	secretnext = "E3M9"
-	sky1 = "SKY3", 0
-	cluster = 3
-	par = 150
-	sucktime = 1
-	music = "$MUSIC_E3M4"
-}
-
-map E3M5 lookup "HUSTR_E3M5"
-{
-	levelnum = 25
-	titlepatch = "WILV24"
-	next = "E3M6"
-	secretnext = "E3M9"
-	sky1 = "SKY3", 0
-	cluster = 3
-	par = 90
-	sucktime = 1
-	music = "$MUSIC_E3M5"
-}
-
-map E3M6 lookup "HUSTR_E3M6"
-{
-	levelnum = 26
-	titlepatch = "WILV25"
-	next = "E3M7"
-	secretnext = "E3M9"
-	sky1 = "SKY3", 0
-	cluster = 3
-	par = 90
-	sucktime = 1
-	music = "$MUSIC_E3M6"
-}
-
-map E3M7 lookup "HUSTR_E3M7"
-{
-	levelnum = 27
-	titlepatch = "WILV26"
-	next = "E3M8"
-	secretnext = "E3M9"
-	sky1 = "SKY3", 0
-	cluster = 3
-	par = 165
-	sucktime = 1
-	music = "$MUSIC_E3M7"
-}
-
-map E3M8 lookup "HUSTR_E3M8"
-{
-	levelnum = 28
-	titlepatch = "WILV27"
-	next = "endbunny"
-	secretnext = "E3M9"
-	sky1 = "SKY3", 0
-	cluster = 3
-	par = 30
-	nointermission
-	nosoundclipping
-	spidermastermindspecial
-	specialaction_exitlevel
-	sucktime = 1
-	music = "$MUSIC_E3M8"
-}
-
-map E3M9 lookup "HUSTR_E3M9"
-{
-	levelnum = 29
-	titlepatch = "WILV28"
-	next = "E3M7"
-	secretnext = "E3M7"
-	sky1 = "SKY3", 0
-	cluster = 3
-	par = 135
-	sucktime = 1
-	music = "$MUSIC_E3M9"
-}
-
-// Retail Episode 4
-
-map E4M1 lookup "HUSTR_E4M1"
-{
-	levelnum = 31
-	titlepatch = "WILV30"
-	next = "E4M2"
-	secretnext = "E4M9"
-	sky1 = "SKY4", 0
-	cluster = 4
-	sucktime = 1
-	music = "$MUSIC_E3M4"
-}
-
-map E4M2 lookup "HUSTR_E4M2"
-{
-	levelnum = 32
-	titlepatch = "WILV31"
-	next = "E4M3"
-	secretnext = "E4M9"
-	sky1 = "SKY4", 0
-	cluster = 4
-	sucktime = 1
-	music = "$MUSIC_E3M2"
-}
-
-map E4M3 lookup "HUSTR_E4M3"
-{
-	levelnum = 33
-	titlepatch = "WILV32"
-	next = "E4M4"
-	secretnext = "E4M9"
-	sky1 = "SKY4", 0
-	cluster = 4
-	sucktime = 1
-	music = "$MUSIC_E3M3"
-}
-
-map E4M4 lookup "HUSTR_E4M4"
-{
-	levelnum = 34
-	titlepatch = "WILV33"
-	next = "E4M5"
-	secretnext = "E4M9"
-	sky1 = "SKY4", 0
-	cluster = 4
-	sucktime = 1
-	music = "$MUSIC_E1M5"
-}
-
-map E4M5 lookup "HUSTR_E4M5"
-{
-	levelnum = 35
-	titlepatch = "WILV34"
-	next = "E4M6"
-	secretnext = "E4M9"
-	sky1 = "SKY4", 0
-	cluster = 4
-	sucktime = 1
-	music = "$MUSIC_E2M7"
-}
-
-map E4M6 lookup "HUSTR_E4M6"
-{
-	levelnum = 36
-	titlepatch = "WILV35"
-	next = "E4M7"
-	secretnext = "E4M9"
-	sky1 = "SKY4", 0
-	cluster = 4
-	cyberdemonspecial
-	specialaction_opendoor
-	sucktime = 1
-	music = "$MUSIC_E2M4"
-}
-
-map E4M7 lookup "HUSTR_E4M7"
-{
-	levelnum = 37
-	titlepatch = "WILV36"
-	next = "E4M8"
-	secretnext = "E4M9"
-	sky1 = "SKY4", 0
-	cluster = 4
-	sucktime = 1
-	music = "$MUSIC_E2M6"
-}
-
-map E4M8 lookup "HUSTR_E4M8"
-{
-	levelnum = 38
-	titlepatch = "WILV37"
-	next = "EndGame4"
-	secretnext = "E4M9"
-	sky1 = "SKY4", 0
-	cluster = 4
-	nointermission
-	nosoundclipping
-	spidermastermindspecial
-	specialaction_lowerfloor
-	sucktime = 1
-	music = "$MUSIC_E2M5"
-}
-
-map E4M9 lookup "HUSTR_E4M9"
-{
-	levelnum = 39
-	titlepatch = "WILV38"
-	next = "E4M3"
-	secretnext = "E4M3"
-	sky1 = "SKY4", 0
-	cluster = 4
-	sucktime = 1
-	music = "$MUSIC_E1M9"
-
-}
-
-// Clusters (correspond with same-numbered episode)
-
-cluster 1
-{
-	flat = "FLOOR4_8"
-	music = "$MUSIC_VICTOR"
-	exittext = lookup, "E1TEXT"
-}
-
-cluster 2
-{
-	flat = "SFLR6_1"
-	music = "$MUSIC_VICTOR"
-	exittext = lookup, "E2TEXT"
-}
-
-cluster 3
-{
-	flat = "MFLR8_4"
-	music = "$MUSIC_VICTOR"
-	exittext = lookup, "E3TEXT"
-}
-
-cluster 4
-{
-	flat = "MFLR8_3"
-	music = "$MUSIC_VICTOR"
-	exittext = lookup, "E4TEXT"
-}
-
+// MAPINFO for Doom 1 (Shareware, Registered, and Retail)
+
+clearepisodes
+episode e1m1
+{
+	picname = "M_EPI1"
+	key = "k"
+}
+
+episode e2m1
+{
+	picname = "M_EPI2"
+	key = "t"
+}
+
+episode e3m1
+{
+	picname = "M_EPI3"
+	key = "i"
+}
+
+episode e4m1
+{
+	picname = "M_EPI4"
+	key = "t"
+	optional
+
+}
+
+// Registered/Retail Episode 1
+
+defaultmap
+{
+	sucktime = 1
+}
+
+map E1M1 lookup "HUSTR_E1M1"
+{
+	levelnum = 1
+	titlepatch = "WILV00"
+	next = "E1M2"
+	secretnext = "E1M9"
+	sky1 = "SKY1"
+	cluster = 1
+	par = 30
+	music = "$MUSIC_E1M1"
+}
+
+map E1M2 lookup "HUSTR_E1M2"
+{
+	levelnum = 2
+	titlepatch = "WILV01"
+	next = "E1M3"
+	secretnext = "E1M9"
+	sky1 = "SKY1"
+	cluster = 1
+	par = 75
+	music = "$MUSIC_E1M2"
+}
+
+map E1M3 lookup "HUSTR_E1M3"
+{
+	levelnum = 3
+	titlepatch = "WILV02"
+	next = "E1M4"
+	secretnext = "E1M9"
+	sky1 = "SKY1"
+	cluster = 1
+	par = 120
+	music = "$MUSIC_E1M3"
+}
+
+map E1M4 lookup "HUSTR_E1M4"
+{
+	levelnum = 4
+	titlepatch = "WILV03"
+	next = "E1M5"
+	secretnext = "E1M9"
+	sky1 = "SKY1"
+	cluster = 1
+	par = 90
+	music = "$MUSIC_E1M4"
+}
+
+map E1M5 lookup "HUSTR_E1M5"
+{
+	levelnum = 5
+	titlepatch = "WILV04"
+	next = "E1M6"
+	secretnext = "E1M9"
+	sky1 = "SKY1"
+	cluster = 1
+	par = 165
+	music = "$MUSIC_E1M5"
+}
+
+map E1M6 lookup "HUSTR_E1M6"
+{
+	levelnum = 6
+	titlepatch = "WILV05"
+	next = "E1M7"
+	secretnext = "E1M9"
+	sky1 = "SKY1"
+	cluster = 1
+	par = 180
+	music = "$MUSIC_E1M6"
+}
+
+map E1M7 lookup "HUSTR_E1M7"
+{
+	levelnum = 7
+	titlepatch = "WILV06"
+	next = "E1M8"
+	secretnext = "E1M9"
+	sky1 = "SKY1"
+	cluster = 1
+	par = 180
+	music = "$MUSIC_E1M7"
+}
+
+map E1M8 lookup "HUSTR_E1M8"
+{
+	levelnum = 8
+	titlepatch = "WILV07"
+	next = "EndGame1"
+	secretnext = "E1M9"
+	sky1 = "SKY1"
+	cluster = 1
+	par = 30
+	nointermission
+	nosoundclipping
+	baronspecial
+	specialaction_lowerfloor
+	music = "$MUSIC_E1M8"
+}
+
+map E1M9 lookup "HUSTR_E1M9"
+{
+	levelnum = 9
+	titlepatch = "WILV08"
+	next = "E1M4"
+	secretnext = "E1M4"
+	sky1 = "SKY1"
+	cluster = 1
+	par = 165
+	music = "$MUSIC_E1M9"
+}
+
+// Registered/Retail Episode 2
+
+map E2M1 lookup "HUSTR_E2M1"
+{
+	levelnum = 11
+	titlepatch = "WILV10"
+	next = "E2M2"
+	secretnext = "E2M9"
+	sky1 = "SKY2"
+	cluster = 2
+	par = 90
+	music = "$MUSIC_E2M1"
+}
+
+map E2M2 lookup "HUSTR_E2M2"
+{
+	levelnum = 12
+	titlepatch = "WILV11"
+	next = "E2M3"
+	secretnext = "E2M9"
+	sky1 = "SKY2"
+	cluster = 2
+	par = 90
+	music = "$MUSIC_E2M2"
+}
+
+map E2M3 lookup "HUSTR_E2M3"
+{
+	levelnum = 13
+	titlepatch = "WILV12"
+	next = "E2M4"
+	secretnext = "E2M9"
+	sky1 = "SKY2"
+	cluster = 2
+	par = 90
+	music = "$MUSIC_E2M3"
+}
+
+map E2M4 lookup "HUSTR_E2M4"
+{
+	levelnum = 14
+	titlepatch = "WILV13"
+	next = "E2M5"
+	secretnext = "E2M9"
+	sky1 = "SKY2"
+	cluster = 2
+	par = 120
+	music = "$MUSIC_E2M4"
+}
+
+map E2M5 lookup "HUSTR_E2M5"
+{
+	levelnum = 15
+	titlepatch = "WILV14"
+	next = "E2M6"
+	secretnext = "E2M9"
+	sky1 = "SKY2"
+	cluster = 2
+	par = 90
+	music = "$MUSIC_E2M5"
+}
+
+map E2M6 lookup "HUSTR_E2M6"
+{
+	levelnum = 16
+	titlepatch = "WILV15"
+	next = "E2M7"
+	secretnext = "E2M9"
+	sky1 = "SKY2"
+	cluster = 2
+	par = 360
+	music = "$MUSIC_E2M6"
+}
+
+map E2M7 lookup "HUSTR_E2M7"
+{
+	levelnum = 17
+	titlepatch = "WILV16"
+	next = "E2M8"
+	secretnext = "E2M9"
+	sky1 = "SKY2"
+	cluster = 2
+	par = 240
+	music = "$MUSIC_E2M7"
+}
+
+map E2M8 lookup "HUSTR_E2M8"
+{
+	levelnum = 18
+	titlepatch = "WILV17"
+	next = "EndGame2"
+	secretnext = "E2M9"
+	sky1 = "SKY2"
+	cluster = 2
+	par = 30
+	nointermission
+	nosoundclipping
+	cyberdemonspecial
+	specialaction_exitlevel
+	music = "$MUSIC_E2M8"
+}
+
+map E2M9 lookup "HUSTR_E2M9"
+{
+	levelnum = 19
+	titlepatch = "WILV18"
+	next = "E2M6"
+	secretnext = "E2M6"
+	sky1 = "SKY2"
+	cluster = 2
+	par = 170
+	music = "$MUSIC_E2M9"
+}
+
+// Registered/Retail Episode 3
+
+map E3M1 lookup "HUSTR_E3M1"
+{
+	levelnum = 21
+	titlepatch = "WILV20"
+	next = "E3M2"
+	secretnext = "E3M9"
+	sky1 = "SKY3"
+	cluster = 3
+	par = 90
+	music = "$MUSIC_E3M1"
+}
+
+map E3M2 lookup "HUSTR_E3M2"
+{
+	levelnum = 22
+	titlepatch = "WILV21"
+	next = "E3M3"
+	secretnext = "E3M9"
+	sky1 = "SKY3"
+	cluster = 3
+	par = 45
+	music = "$MUSIC_E3M2"
+}
+
+map E3M3 lookup "HUSTR_E3M3"
+{
+	levelnum = 23
+	titlepatch = "WILV22"
+	next = "E3M4"
+	secretnext = "E3M9"
+	sky1 = "SKY3"
+	cluster = 3
+	par = 90
+	music = "$MUSIC_E3M3"
+}
+
+map E3M4 lookup "HUSTR_E3M4"
+{
+	levelnum = 24
+	titlepatch = "WILV23"
+	next = "E3M5"
+	secretnext = "E3M9"
+	sky1 = "SKY3"
+	cluster = 3
+	par = 150
+	music = "$MUSIC_E3M4"
+}
+
+map E3M5 lookup "HUSTR_E3M5"
+{
+	levelnum = 25
+	titlepatch = "WILV24"
+	next = "E3M6"
+	secretnext = "E3M9"
+	sky1 = "SKY3"
+	cluster = 3
+	par = 90
+	music = "$MUSIC_E3M5"
+}
+
+map E3M6 lookup "HUSTR_E3M6"
+{
+	levelnum = 26
+	titlepatch = "WILV25"
+	next = "E3M7"
+	secretnext = "E3M9"
+	sky1 = "SKY3"
+	cluster = 3
+	par = 90
+	music = "$MUSIC_E3M6"
+}
+
+map E3M7 lookup "HUSTR_E3M7"
+{
+	levelnum = 27
+	titlepatch = "WILV26"
+	next = "E3M8"
+	secretnext = "E3M9"
+	sky1 = "SKY3"
+	cluster = 3
+	par = 165
+	music = "$MUSIC_E3M7"
+}
+
+map E3M8 lookup "HUSTR_E3M8"
+{
+	levelnum = 28
+	titlepatch = "WILV27"
+	next = "endbunny"
+	secretnext = "E3M9"
+	sky1 = "SKY3"
+	cluster = 3
+	par = 30
+	nointermission
+	nosoundclipping
+	spidermastermindspecial
+	specialaction_exitlevel
+	music = "$MUSIC_E3M8"
+}
+
+map E3M9 lookup "HUSTR_E3M9"
+{
+	levelnum = 29
+	titlepatch = "WILV28"
+	next = "E3M7"
+	secretnext = "E3M7"
+	sky1 = "SKY3"
+	cluster = 3
+	par = 135
+	music = "$MUSIC_E3M9"
+}
+
+// Retail Episode 4
+
+map E4M1 lookup "HUSTR_E4M1"
+{
+	levelnum = 31
+	titlepatch = "WILV30"
+	next = "E4M2"
+	secretnext = "E4M9"
+	sky1 = "SKY4"
+	cluster = 4
+	music = "$MUSIC_E3M4"
+}
+
+map E4M2 lookup "HUSTR_E4M2"
+{
+	levelnum = 32
+	titlepatch = "WILV31"
+	next = "E4M3"
+	secretnext = "E4M9"
+	sky1 = "SKY4"
+	cluster = 4
+	music = "$MUSIC_E3M2"
+}
+
+map E4M3 lookup "HUSTR_E4M3"
+{
+	levelnum = 33
+	titlepatch = "WILV32"
+	next = "E4M4"
+	secretnext = "E4M9"
+	sky1 = "SKY4"
+	cluster = 4
+	music = "$MUSIC_E3M3"
+}
+
+map E4M4 lookup "HUSTR_E4M4"
+{
+	levelnum = 34
+	titlepatch = "WILV33"
+	next = "E4M5"
+	secretnext = "E4M9"
+	sky1 = "SKY4"
+	cluster = 4
+	music = "$MUSIC_E1M5"
+}
+
+map E4M5 lookup "HUSTR_E4M5"
+{
+	levelnum = 35
+	titlepatch = "WILV34"
+	next = "E4M6"
+	secretnext = "E4M9"
+	sky1 = "SKY4"
+	cluster = 4
+	music = "$MUSIC_E2M7"
+}
+
+map E4M6 lookup "HUSTR_E4M6"
+{
+	levelnum = 36
+	titlepatch = "WILV35"
+	next = "E4M7"
+	secretnext = "E4M9"
+	sky1 = "SKY4"
+	cluster = 4
+	cyberdemonspecial
+	specialaction_opendoor
+	music = "$MUSIC_E2M4"
+}
+
+map E4M7 lookup "HUSTR_E4M7"
+{
+	levelnum = 37
+	titlepatch = "WILV36"
+	next = "E4M8"
+	secretnext = "E4M9"
+	sky1 = "SKY4"
+	cluster = 4
+	music = "$MUSIC_E2M6"
+}
+
+map E4M8 lookup "HUSTR_E4M8"
+{
+	levelnum = 38
+	titlepatch = "WILV37"
+	next = "EndGame4"
+	secretnext = "E4M9"
+	sky1 = "SKY4"
+	cluster = 4
+	nointermission
+	nosoundclipping
+	spidermastermindspecial
+	specialaction_lowerfloor
+	music = "$MUSIC_E2M5"
+}
+
+map E4M9 lookup "HUSTR_E4M9"
+{
+	levelnum = 39
+	titlepatch = "WILV38"
+	next = "E4M3"
+	secretnext = "E4M3"
+	sky1 = "SKY4"
+	cluster = 4
+	music = "$MUSIC_E1M9"
+}
+
+// Clusters (correspond with same-numbered episode)
+
+cluster 1
+{
+	flat = "FLOOR4_8"
+	music = "$MUSIC_VICTOR"
+	exittext = lookup, "E1TEXT"
+}
+
+cluster 2
+{
+	flat = "SFLR6_1"
+	music = "$MUSIC_VICTOR"
+	exittext = lookup, "E2TEXT"
+}
+
+cluster 3
+{
+	flat = "MFLR8_4"
+	music = "$MUSIC_VICTOR"
+	exittext = lookup, "E3TEXT"
+}
+
+cluster 4
+{
+	flat = "MFLR8_3"
+	music = "$MUSIC_VICTOR"
+	exittext = lookup, "E4TEXT"
+}
+
diff --git a/wadsrc/static/mapinfo/doom2.txt b/wadsrc/static/mapinfo/doom2.txt
index 3b03b03184..4d8a8c1938 100644
--- a/wadsrc/static/mapinfo/doom2.txt
+++ b/wadsrc/static/mapinfo/doom2.txt
@@ -1,4 +1,5 @@
-// MAPINFO for Doom 2

+// MAPINFO for Doom 2
+
 clearepisodes
 episode map01
 {
@@ -6,15 +7,19 @@ episode map01
 	key = "h"
 }
 
+defaultmap
+{
+	sucktime = 1
+}
+
 map MAP01 lookup "HUSTR_1"
 {
 	titlepatch = "CWILV00"
 	next = "MAP02"
 	secretnext = "MAP02"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 30
-	sucktime = 1
 	music = "$MUSIC_RUNNIN"
 }
 
@@ -23,10 +28,9 @@ map MAP02 lookup "HUSTR_2"
 	titlepatch = "CWILV01"
 	next = "MAP03"
 	secretnext = "MAP03"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 90
-	sucktime = 1
 	music = "$MUSIC_STALKS"
 }
 
@@ -35,10 +39,9 @@ map MAP03 lookup "HUSTR_3"
 	titlepatch = "CWILV02"
 	next = "MAP04"
 	secretnext = "MAP04"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 120
-	sucktime = 1
 	music = "$MUSIC_COUNTD"
 }
 
@@ -47,10 +50,9 @@ map MAP04 lookup "HUSTR_4"
 	titlepatch = "CWILV03"
 	next = "MAP05"
 	secretnext = "MAP05"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 120
-	sucktime = 1
 	music = "$MUSIC_BETWEE"
 }
 
@@ -59,10 +61,9 @@ map MAP05 lookup "HUSTR_5"
 	titlepatch = "CWILV04"
 	next = "MAP06"
 	secretnext = "MAP06"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 90
-	sucktime = 1
 	music = "$MUSIC_DOOM"
 }
 
@@ -71,7 +72,7 @@ map MAP06 lookup "HUSTR_6"
 	titlepatch = "CWILV05"
 	next = "MAP07"
 	secretnext = "MAP07"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 150
 	sucktime = 1
@@ -83,11 +84,10 @@ map MAP07 lookup "HUSTR_7"
 	titlepatch = "CWILV06"
 	next = "MAP08"
 	secretnext = "MAP08"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 120
 	map07special
-	sucktime = 1
 	music = "$MUSIC_SHAWN"
 }
 
@@ -96,10 +96,9 @@ map MAP08 lookup "HUSTR_8"
 	titlepatch = "CWILV07"
 	next = "MAP09"
 	secretnext = "MAP09"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 120
-	sucktime = 1
 	music = "$MUSIC_DDTBLU"
 }
 
@@ -108,10 +107,9 @@ map MAP09 lookup "HUSTR_9"
 	titlepatch = "CWILV08"
 	next = "MAP10"
 	secretnext = "MAP10"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 270
-	sucktime = 1
 	music = "$MUSIC_IN_CIT"
 }
 
@@ -120,10 +118,9 @@ map MAP10 lookup "HUSTR_10"
 	titlepatch = "CWILV09"
 	next = "MAP11"
 	secretnext = "MAP11"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 90
-	sucktime = 1
 	music = "$MUSIC_DEAD"
 }
 
@@ -132,10 +129,9 @@ map MAP11 lookup "HUSTR_11"
 	titlepatch = "CWILV10"
 	next = "MAP12"
 	secretnext = "MAP12"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 210
-	sucktime = 1
 	music = "$MUSIC_STLKS2"
 }
 
@@ -144,10 +140,9 @@ map MAP12 lookup "HUSTR_12"
 	titlepatch = "CWILV11"
 	next = "MAP13"
 	secretnext = "MAP13"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_THEDA2"
 }
 
@@ -156,10 +151,9 @@ map MAP13 lookup "HUSTR_13"
 	titlepatch = "CWILV12"
 	next = "MAP14"
 	secretnext = "MAP14"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_DOOM2"
 }
 
@@ -168,10 +162,9 @@ map MAP14 lookup "HUSTR_14"
 	titlepatch = "CWILV13"
 	next = "MAP15"
 	secretnext = "MAP15"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_DDTBL2"
 }
 
@@ -180,10 +173,9 @@ map MAP15 lookup "HUSTR_15"
 	titlepatch = "CWILV14"
 	next = "MAP16"
 	secretnext = "MAP31"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 210
-	sucktime = 1
 	music = "$MUSIC_RUNNI2"
 }
 
@@ -192,10 +184,9 @@ map MAP16 lookup "HUSTR_16"
 	titlepatch = "CWILV15"
 	next = "MAP17"
 	secretnext = "MAP17"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_DEAD2"
 }
 
@@ -204,10 +195,9 @@ map MAP17 lookup "HUSTR_17"
 	titlepatch = "CWILV16"
 	next = "MAP18"
 	secretnext = "MAP18"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 420
-	sucktime = 1
 	music = "$MUSIC_STLKS3"
 }
 
@@ -216,10 +206,9 @@ map MAP18 lookup "HUSTR_18"
 	titlepatch = "CWILV17"
 	next = "MAP19"
 	secretnext = "MAP19"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_ROMERO"
 }
 
@@ -228,10 +217,9 @@ map MAP19 lookup "HUSTR_19"
 	titlepatch = "CWILV18"
 	next = "MAP20"
 	secretnext = "MAP20"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 210
-	sucktime = 1
 	music = "$MUSIC_SHAWN2"
 }
 
@@ -240,10 +228,9 @@ map MAP20 lookup "HUSTR_20"
 	titlepatch = "CWILV19"
 	next = "MAP21"
 	secretnext = "MAP21"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_MESSAG"
 }
 
@@ -252,10 +239,9 @@ map MAP21 lookup "HUSTR_21"
 	titlepatch = "CWILV20"
 	next = "MAP22"
 	secretnext = "MAP22"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 240
-	sucktime = 1
 	music = "$MUSIC_COUNT2"
 }
 
@@ -264,10 +250,9 @@ map MAP22 lookup "HUSTR_22"
 	titlepatch = "CWILV21"
 	next = "MAP23"
 	secretnext = "MAP23"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_DDTBL3"
 }
 
@@ -276,10 +261,9 @@ map MAP23 lookup "HUSTR_23"
 	titlepatch = "CWILV22"
 	next = "MAP24"
 	secretnext = "MAP24"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 180
-	sucktime = 1
 	music = "$MUSIC_AMPIE"
 }
 
@@ -288,10 +272,9 @@ map MAP24 lookup "HUSTR_24"
 	titlepatch = "CWILV23"
 	next = "MAP25"
 	secretnext = "MAP25"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_THEDA3"
 }
 
@@ -300,10 +283,9 @@ map MAP25 lookup "HUSTR_25"
 	titlepatch = "CWILV24"
 	next = "MAP26"
 	secretnext = "MAP26"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_ADRIAN"
 }
 
@@ -312,10 +294,9 @@ map MAP26 lookup "HUSTR_26"
 	titlepatch = "CWILV25"
 	next = "MAP27"
 	secretnext = "MAP27"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 300
-	sucktime = 1
 	music = "$MUSIC_MESSG2"
 }
 
@@ -324,10 +305,9 @@ map MAP27 lookup "HUSTR_27"
 	titlepatch = "CWILV26"
 	next = "MAP28"
 	secretnext = "MAP28"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 330
-	sucktime = 1
 	music = "$MUSIC_ROMER2"
 }
 
@@ -336,10 +316,9 @@ map MAP28 lookup "HUSTR_28"
 	titlepatch = "CWILV27"
 	next = "MAP29"
 	secretnext = "MAP29"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 420
-	sucktime = 1
 	music = "$MUSIC_TENSE"
 }
 
@@ -348,10 +327,9 @@ map MAP29 lookup "HUSTR_29"
 	titlepatch = "CWILV28"
 	next = "MAP30"
 	secretnext = "MAP30"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 300
-	sucktime = 1
 	music = "$MUSIC_SHAWN3"
 }
 
@@ -360,11 +338,10 @@ map MAP30 lookup "HUSTR_30"
 	titlepatch = "CWILV29"
 	next = "EndGameC"
 	secretnext = "EndGameC"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 180
 	allowmonstertelefrags
-	sucktime = 1
 	music = "$MUSIC_OPENIN"
 }
 
@@ -373,10 +350,9 @@ map MAP31 lookup "HUSTR_31"
 	titlepatch = "CWILV30"
 	next = "MAP16"
 	secretnext = "MAP32"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 9
 	par = 120
-	sucktime = 1
 	music = "$MUSIC_EVIL"
 }
 
@@ -385,12 +361,10 @@ map MAP32 lookup "HUSTR_32"
 	titlepatch = "CWILV31"
 	next = "MAP16"
 	secretnext = "MAP16"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 10
 	par = 30
-	sucktime = 1
 	music = "$MUSIC_ULTIMA"
-
 }
 
 // DOOM II first cluster (up thru level 6)
diff --git a/wadsrc/static/mapinfo/heretic.txt b/wadsrc/static/mapinfo/heretic.txt
index 11a2b81afb..ccc6ea12b8 100644
--- a/wadsrc/static/mapinfo/heretic.txt
+++ b/wadsrc/static/mapinfo/heretic.txt
@@ -1,4 +1,5 @@
-// MAPINFO for Heretic (Shareware and Retail)

+// MAPINFO for Heretic (Shareware and Retail)
+
 skill baby
 {
 	AutoUseHealth
@@ -81,7 +82,7 @@ map E1M1 lookup "HHUSTR_E1M1"
 {
 	next = "E1M2"
 	secretnext = "E1M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	music = "MUS_E1M1"
 }
@@ -90,7 +91,7 @@ map E1M2 lookup "HHUSTR_E1M2"
 {
 	next = "E1M3"
 	secretnext = "E1M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	music = "MUS_E1M2"
 }
@@ -99,7 +100,7 @@ map E1M3 lookup "HHUSTR_E1M3"
 {
 	next = "E1M4"
 	secretnext = "E1M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	music = "MUS_E1M3"
 }
@@ -108,7 +109,7 @@ map E1M4 lookup "HHUSTR_E1M4"
 {
 	next = "E1M5"
 	secretnext = "E1M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	music = "MUS_E1M4"
 }
@@ -117,7 +118,7 @@ map E1M5 lookup "HHUSTR_E1M5"
 {
 	next = "E1M6"
 	secretnext = "E1M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	music = "MUS_E1M5"
 }
@@ -126,7 +127,7 @@ map E1M6 lookup "HHUSTR_E1M6"
 {
 	next = "E1M7"
 	secretnext = "E1M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	music = "MUS_E1M6"
 }
@@ -135,7 +136,7 @@ map E1M7 lookup "HHUSTR_E1M7"
 {
 	next = "E1M8"
 	secretnext = "E1M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	music = "MUS_E1M7"
 }
@@ -144,7 +145,7 @@ map E1M8 lookup "HHUSTR_E1M8"
 {
 	next = "EndGame1"
 	secretnext = "E1M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	nointermission
 	ironlichspecial
@@ -156,7 +157,7 @@ map E1M9 lookup "HHUSTR_E1M9"
 {
 	next = "E1M7"
 	secretnext = "E1M7"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 1
 	music = "MUS_E1M9"
 }
@@ -167,7 +168,7 @@ map E2M1 lookup "HHUSTR_E2M1"
 {
 	next = "E2M2"
 	secretnext = "E2M9"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 2
 	music = "MUS_E2M1"
 }
@@ -176,7 +177,7 @@ map E2M2 lookup "HHUSTR_E2M2"
 {
 	next = "E2M3"
 	secretnext = "E2M9"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 2
 	music = "MUS_E2M2"
 }
@@ -185,7 +186,7 @@ map E2M3 lookup "HHUSTR_E2M3"
 {
 	next = "E2M4"
 	secretnext = "E2M9"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 2
 	music = "MUS_E2M3"
 }
@@ -194,7 +195,7 @@ map E2M4 lookup "HHUSTR_E2M4"
 {
 	next = "E2M5"
 	secretnext = "E2M9"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 2
 	music = "MUS_E2M4"
 }
@@ -203,7 +204,7 @@ map E2M5 lookup "HHUSTR_E2M5"
 {
 	next = "E2M6"
 	secretnext = "E2M9"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 2
 	music = "MUS_E1M4"
 }
@@ -212,7 +213,7 @@ map E2M6 lookup "HHUSTR_E2M6"
 {
 	next = "E2M7"
 	secretnext = "E2M9"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 2
 	music = "MUS_E2M6"
 }
@@ -221,7 +222,7 @@ map E2M7 lookup "HHUSTR_E2M7"
 {
 	next = "E2M8"
 	secretnext = "E2M9"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 2
 	music = "MUS_E2M7"
 }
@@ -230,7 +231,7 @@ map E2M8 lookup "HHUSTR_E2M8"
 {
 	next = "EndGameW"
 	secretnext = "E2M9"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 2
 	nointermission
 	minotaurspecial
@@ -243,7 +244,7 @@ map E2M9 lookup "HHUSTR_E2M9"
 {
 	next = "E2M5"
 	secretnext = "E2M5"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 2
 	music = "MUS_E2M9"
 }
@@ -254,7 +255,7 @@ map E3M1 lookup "HHUSTR_E3M1"
 {
 	next = "E3M2"
 	secretnext = "E3M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 3
 	music = "MUS_E1M1"
 }
@@ -263,7 +264,7 @@ map E3M2 lookup "HHUSTR_E3M2"
 {
 	next = "E3M3"
 	secretnext = "E3M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 3
 	music = "MUS_E3M2"
 }
@@ -272,7 +273,7 @@ map E3M3 lookup "HHUSTR_E3M3"
 {
 	next = "E3M4"
 	secretnext = "E3M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 3
 	music = "MUS_E3M3"
 }
@@ -281,7 +282,7 @@ map E3M4 lookup "HHUSTR_E3M4"
 {
 	next = "E3M5"
 	secretnext = "E3M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 3
 	music = "MUS_E1M6"
 }
@@ -290,7 +291,7 @@ map E3M5 lookup "HHUSTR_E3M5"
 {
 	next = "E3M6"
 	secretnext = "E3M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 3
 	music = "MUS_E1M3"
 }
@@ -299,7 +300,7 @@ map E3M6 lookup "HHUSTR_E3M6"
 {
 	next = "E3M7"
 	secretnext = "E3M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 3
 	music = "MUS_E1M2"
 }
@@ -308,7 +309,7 @@ map E3M7 lookup "HHUSTR_E3M7"
 {
 	next = "E3M8"
 	secretnext = "E3M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 3
 	music = "MUS_E1M5"
 }
@@ -317,7 +318,7 @@ map E3M8 lookup "HHUSTR_E3M8"
 {
 	next = "EndDemon"
 	secretnext = "E3M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 3
 	nointermission
 	dsparilspecial
@@ -330,7 +331,7 @@ map E3M9 lookup "HHUSTR_E3M9"
 {
 	next = "E3M5"
 	secretnext = "E3M5"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 3
 	music = "MUS_E2M6"
 }
@@ -341,7 +342,7 @@ map E4M1 lookup "HHUSTR_E4M1"
 {
 	next = "E4M2"
 	secretnext = "E4M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 4
 	music = "MUS_E1M6"
 }
@@ -350,7 +351,7 @@ map E4M2 lookup "HHUSTR_E4M2"
 {
 	next = "E4M3"
 	secretnext = "E4M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 4
 	music = "MUS_E1M2"
 }
@@ -359,7 +360,7 @@ map E4M3 lookup "HHUSTR_E4M3"
 {
 	next = "E4M4"
 	secretnext = "E4M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 4
 	music = "MUS_E1M3"
 }
@@ -368,7 +369,7 @@ map E4M4 lookup "HHUSTR_E4M4"
 {
 	next = "E4M5"
 	secretnext = "E4M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 4
 	music = "MUS_E1M4"
 }
@@ -377,7 +378,7 @@ map E4M5 lookup "HHUSTR_E4M5"
 {
 	next = "E4M6"
 	secretnext = "E4M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 4
 	music = "MUS_E1M5"
 }
@@ -386,7 +387,7 @@ map E4M6 lookup "HHUSTR_E4M6"
 {
 	next = "E4M7"
 	secretnext = "E4M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 4
 	music = "MUS_E1M1"
 }
@@ -395,7 +396,7 @@ map E4M7 lookup "HHUSTR_E4M7"
 {
 	next = "E4M8"
 	secretnext = "E4M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 4
 	music = "MUS_E1M7"
 }
@@ -404,7 +405,7 @@ map E4M8 lookup "HHUSTR_E4M8"
 {
 	next = "EndGame4"
 	secretnext = "E4M9"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 4
 	nointermission
 	ironlichspecial
@@ -417,7 +418,7 @@ map E4M9 lookup "HHUSTR_E4M9"
 {
 	next = "E4M5"
 	secretnext = "E4M5"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 4
 	music = "MUS_E1M9"
 }
@@ -428,7 +429,7 @@ map E5M1 lookup "HHUSTR_E5M1"
 {
 	next = "E5M2"
 	secretnext = "E5M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 5
 	music = "MUS_E2M1"
 }
@@ -437,7 +438,7 @@ map E5M2 lookup "HHUSTR_E5M2"
 {
 	next = "E5M3"
 	secretnext = "E5M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 5
 	music = "MUS_E2M2"
 }
@@ -446,7 +447,7 @@ map E5M3 lookup "HHUSTR_E5M3"
 {
 	next = "E5M4"
 	secretnext = "E5M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 5
 	music = "MUS_E2M3"
 }
@@ -455,7 +456,7 @@ map E5M4 lookup "HHUSTR_E5M4"
 {
 	next = "E5M5"
 	secretnext = "E5M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 5
 	music = "MUS_E2M4"
 }
@@ -464,7 +465,7 @@ map E5M5 lookup "HHUSTR_E5M5"
 {
 	next = "E5M6"
 	secretnext = "E5M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 5
 	music = "MUS_E1M4"
 }
@@ -473,7 +474,7 @@ map E5M6 lookup "HHUSTR_E5M6"
 {
 	next = "E5M7"
 	secretnext = "E5M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 5
 	music = "MUS_E2M6"
 }
@@ -482,7 +483,7 @@ map E5M7 lookup "HHUSTR_E5M7"
 {
 	next = "E5M8"
 	secretnext = "E5M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 5
 	music = "MUS_E2M7"
 }
@@ -491,7 +492,7 @@ map E5M8 lookup "HHUSTR_E5M8"
 {
 	next = "EndGame1"
 	secretnext = "E5M9"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 5
 	nointermission
 	minotaurspecial
@@ -504,7 +505,7 @@ map E5M9 lookup "HHUSTR_E5M9"
 {
 	next = "E5M4"
 	secretnext = "E5M4"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 5
 	music = "MUS_E2M9"
 }
@@ -515,7 +516,7 @@ map E6M1 "Untitled"
 {
 	next = "E6M2"
 	secretnext = "E6M2"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	music = "MUS_E3M2"
 }
@@ -524,7 +525,7 @@ map E6M2 "Untitled"
 {
 	next = "E6M3"
 	secretnext = "E6M3"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	music = "MUS_E3M3"
 }
@@ -533,7 +534,7 @@ map E6M3 "Untitled"
 {
 	next = "E6M1"
 	secretnext = "E6M1"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	music = "MUS_E1M6"
 }
@@ -579,4 +580,3 @@ cluster 6
 {
 	flat = "FLOOR25"
 }
-
diff --git a/wadsrc/static/mapinfo/hexen.txt b/wadsrc/static/mapinfo/hexen.txt
index 5760d3fb99..fb6238fc55 100644
--- a/wadsrc/static/mapinfo/hexen.txt
+++ b/wadsrc/static/mapinfo/hexen.txt
@@ -1,5 +1,7 @@
-// A bare-bones MAPINFO for Hexen.

-// Most of the MAPINFO is still in hexen.wad.

+// A bare-bones MAPINFO for Hexen.
+
+// Most of the MAPINFO is still in hexen.wad.
+
 skill baby
 {
 	AutoUseHealth
diff --git a/wadsrc/static/mapinfo/plutonia.txt b/wadsrc/static/mapinfo/plutonia.txt
index 0648bce4f8..2fe625b083 100644
--- a/wadsrc/static/mapinfo/plutonia.txt
+++ b/wadsrc/static/mapinfo/plutonia.txt
@@ -1,5 +1,7 @@
-// MAPINFO for Plutonia. Exactly the same as Doom 2, except it

-// has different map names and cluster messages.

+// MAPINFO for Plutonia. Exactly the same as Doom 2, except it
+
+// has different map names and cluster messages.
+
 clearepisodes
 episode map01
 {
@@ -7,15 +9,19 @@ episode map01
 	key  = "t"
 }
 
+defaultmap
+{
+	sucktime = 1
+}
+
 map MAP01 lookup "PHUSTR_1"
 {
 	titlepatch = "CWILV00"
 	next = "MAP02"
 	secretnext = "MAP02"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 30
-	sucktime = 1
 	music = "$MUSIC_RUNNIN"
 }
 
@@ -24,10 +30,9 @@ map MAP02 lookup "PHUSTR_2"
 	titlepatch = "CWILV01"
 	next = "MAP03"
 	secretnext = "MAP03"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 90
-	sucktime = 1
 	music = "$MUSIC_STALKS"
 }
 
@@ -36,10 +41,9 @@ map MAP03 lookup "PHUSTR_3"
 	titlepatch = "CWILV02"
 	next = "MAP04"
 	secretnext = "MAP04"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 120
-	sucktime = 1
 	music = "$MUSIC_COUNTD"
 }
 
@@ -48,10 +52,9 @@ map MAP04 lookup "PHUSTR_4"
 	titlepatch = "CWILV03"
 	next = "MAP05"
 	secretnext = "MAP05"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 120
-	sucktime = 1
 	music = "$MUSIC_BETWEE"
 }
 
@@ -60,10 +63,9 @@ map MAP05 lookup "PHUSTR_5"
 	titlepatch = "CWILV04"
 	next = "MAP06"
 	secretnext = "MAP06"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 90
-	sucktime = 1
 	music = "$MUSIC_DOOM"
 }
 
@@ -72,10 +74,9 @@ map MAP06 lookup "PHUSTR_6"
 	titlepatch = "CWILV05"
 	next = "MAP07"
 	secretnext = "MAP07"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_THE_DA"
 }
 
@@ -84,10 +85,9 @@ map MAP07 lookup "PHUSTR_7"
 	titlepatch = "CWILV06"
 	next = "MAP08"
 	secretnext = "MAP08"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 120
-	sucktime = 1
 	map07special
 	music = "$MUSIC_SHAWN"
 }
@@ -97,10 +97,9 @@ map MAP08 lookup "PHUSTR_8"
 	titlepatch = "CWILV07"
 	next = "MAP09"
 	secretnext = "MAP09"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 120
-	sucktime = 1
 	music = "$MUSIC_DDTBLU"
 }
 
@@ -109,10 +108,9 @@ map MAP09 lookup "PHUSTR_9"
 	titlepatch = "CWILV08"
 	next = "MAP10"
 	secretnext = "MAP10"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 270
-	sucktime = 1
 	music = "$MUSIC_IN_CIT"
 }
 
@@ -121,10 +119,9 @@ map MAP10 lookup "PHUSTR_10"
 	titlepatch = "CWILV09"
 	next = "MAP11"
 	secretnext = "MAP11"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 90
-	sucktime = 1
 	music = "$MUSIC_DEAD"
 }
 
@@ -133,10 +130,9 @@ map MAP11 lookup "PHUSTR_11"
 	titlepatch = "CWILV10"
 	next = "MAP12"
 	secretnext = "MAP12"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 210
-	sucktime = 1
 	music = "$MUSIC_STLKS2"
 }
 
@@ -145,10 +141,9 @@ map MAP12 lookup "PHUSTR_12"
 	titlepatch = "CWILV11"
 	next = "MAP13"
 	secretnext = "MAP13"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_THEDA2"
 }
 
@@ -157,10 +152,9 @@ map MAP13 lookup "PHUSTR_13"
 	titlepatch = "CWILV12"
 	next = "MAP14"
 	secretnext = "MAP14"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_DOOM2"
 }
 
@@ -169,10 +163,9 @@ map MAP14 lookup "PHUSTR_14"
 	titlepatch = "CWILV13"
 	next = "MAP15"
 	secretnext = "MAP15"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_DDTBL2"
 }
 
@@ -181,10 +174,9 @@ map MAP15 lookup "PHUSTR_15"
 	titlepatch = "CWILV14"
 	next = "MAP16"
 	secretnext = "MAP31"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 210
-	sucktime = 1
 	music = "$MUSIC_RUNNI2"
 }
 
@@ -193,10 +185,9 @@ map MAP16 lookup "PHUSTR_16"
 	titlepatch = "CWILV15"
 	next = "MAP17"
 	secretnext = "MAP17"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_DEAD2"
 }
 
@@ -205,10 +196,9 @@ map MAP17 lookup "PHUSTR_17"
 	titlepatch = "CWILV16"
 	next = "MAP18"
 	secretnext = "MAP18"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 420
-	sucktime = 1
 	music = "$MUSIC_STLKS3"
 }
 
@@ -217,10 +207,9 @@ map MAP18 lookup "PHUSTR_18"
 	titlepatch = "CWILV17"
 	next = "MAP19"
 	secretnext = "MAP19"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_ROMERO"
 }
 
@@ -229,10 +218,9 @@ map MAP19 lookup "PHUSTR_19"
 	titlepatch = "CWILV18"
 	next = "MAP20"
 	secretnext = "MAP20"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 210
-	sucktime = 1
 	music = "$MUSIC_SHAWN2"
 }
 
@@ -241,10 +229,9 @@ map MAP20 lookup "PHUSTR_20"
 	titlepatch = "CWILV19"
 	next = "MAP21"
 	secretnext = "MAP21"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_MESSAG"
 }
 
@@ -253,10 +240,9 @@ map MAP21 lookup "PHUSTR_21"
 	titlepatch = "CWILV20"
 	next = "MAP22"
 	secretnext = "MAP22"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 240
-	sucktime = 1
 	music = "$MUSIC_COUNT2"
 }
 
@@ -265,10 +251,9 @@ map MAP22 lookup "PHUSTR_22"
 	titlepatch = "CWILV21"
 	next = "MAP23"
 	secretnext = "MAP23"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_DDTBL3"
 }
 
@@ -277,10 +262,9 @@ map MAP23 lookup "PHUSTR_23"
 	titlepatch = "CWILV22"
 	next = "MAP24"
 	secretnext = "MAP24"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 180
-	sucktime = 1
 	music = "$MUSIC_AMPIE"
 }
 
@@ -289,10 +273,9 @@ map MAP24 lookup "PHUSTR_24"
 	titlepatch = "CWILV23"
 	next = "MAP25"
 	secretnext = "MAP25"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_THEDA3"
 }
 
@@ -301,10 +284,9 @@ map MAP25 lookup "PHUSTR_25"
 	titlepatch = "CWILV24"
 	next = "MAP26"
 	secretnext = "MAP26"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_ADRIAN"
 }
 
@@ -313,10 +295,9 @@ map MAP26 lookup "PHUSTR_26"
 	titlepatch = "CWILV25"
 	next = "MAP27"
 	secretnext = "MAP27"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 300
-	sucktime = 1
 	music = "$MUSIC_MESSG2"
 }
 
@@ -325,10 +306,9 @@ map MAP27 lookup "PHUSTR_27"
 	titlepatch = "CWILV26"
 	next = "MAP28"
 	secretnext = "MAP28"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 330
-	sucktime = 1
 	music = "$MUSIC_ROMER2"
 }
 
@@ -337,10 +317,9 @@ map MAP28 lookup "PHUSTR_28"
 	titlepatch = "CWILV27"
 	next = "MAP29"
 	secretnext = "MAP29"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 420
-	sucktime = 1
 	music = "$MUSIC_TENSE"
 }
 
@@ -349,10 +328,9 @@ map MAP29 lookup "PHUSTR_29"
 	titlepatch = "CWILV28"
 	next = "MAP30"
 	secretnext = "MAP30"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 300
-	sucktime = 1
 	music = "$MUSIC_SHAWN3"
 }
 
@@ -361,10 +339,9 @@ map MAP30 lookup "PHUSTR_30"
 	titlepatch = "CWILV29"
 	next = "EndGameC"
 	secretnext = "EndGameC"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 180
-	sucktime = 1
 	allowmonstertelefrags
 	music = "$MUSIC_OPENIN"
 }
@@ -374,10 +351,9 @@ map MAP31 lookup "PHUSTR_31"
 	titlepatch = "CWILV30"
 	next = "MAP16"
 	secretnext = "MAP32"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 9
 	par = 120
-	sucktime = 1
 	music = "$MUSIC_EVIL"
 }
 
@@ -386,10 +362,9 @@ map MAP32 lookup "PHUSTR_32"
 	titlepatch = "CWILV31"
 	next = "MAP16"
 	secretnext = "MAP16"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 10
 	par = 30
-	sucktime = 1
 	music = "$MUSIC_ULTIMA"
 }
 
diff --git a/wadsrc/static/mapinfo/strife.txt b/wadsrc/static/mapinfo/strife.txt
index 3ea9f94414..cd8ea34a29 100644
--- a/wadsrc/static/mapinfo/strife.txt
+++ b/wadsrc/static/mapinfo/strife.txt
@@ -1,4 +1,5 @@
-// MAPINFO for Strife (full version and teaser)

+// MAPINFO for Strife (full version and teaser)
+
 skill baby
 {
 	AutoUseHealth
@@ -54,7 +55,7 @@ gamedefaults
 map MAP01 "AREA 1: sanctuary"
 {
 	next = "MAP02"
-	sky1 = "SKYMNT02", 0
+	sky1 = "SKYMNT02"
 	music = "D_ACTION"
 	cluster = 1
 }
@@ -62,7 +63,7 @@ map MAP01 "AREA 1: sanctuary"
 map MAP02 "AREA 2: town"
 {
 	next = "MAP03"
-	sky1 = "SKYMNT02", 0
+	sky1 = "SKYMNT02"
 	music = "D_TAVERN"
 	cluster = 1
 }
@@ -70,18 +71,17 @@ map MAP02 "AREA 2: town"
 map MAP03 "AREA 3: front base"
 {
 	next = "MAP04"
-	sky1 = "SKYMNT02", 0
+	sky1 = "SKYMNT02"
 	music = "D_DANGER"
 	cluster = 1
 	noallies
-	redirect = "Sigil"
-, "map30"
+	redirect = "Sigil", "map30"
 }
 
 map MAP04 "AREA 4: power station"
 {
 	next = "MAP05"
-	sky1 = "SKYMNT02", 0
+	sky1 = "SKYMNT02"
 	music = "D_FAST"
 	cluster = 1
 }
@@ -89,7 +89,7 @@ map MAP04 "AREA 4: power station"
 map MAP05 "AREA 5: prison"
 {
 	next = "MAP06"
-	sky1 = "SKYMNT02", 0
+	sky1 = "SKYMNT02"
 	music = "D_INTRO"
 	cluster = 1
 }
@@ -97,7 +97,7 @@ map MAP05 "AREA 5: prison"
 map MAP06 "AREA 6: sewers"
 {
 	next = "MAP07"
-	sky1 = "SKYMNT02", 0
+	sky1 = "SKYMNT02"
 	music = "D_DARKER"
 	cluster = 1
 }
@@ -105,17 +105,16 @@ map MAP06 "AREA 6: sewers"
 map MAP07 "AREA 7: castle"
 {
 	next = "MAP08"
-	sky1 = "SKYMNT02", 0
+	sky1 = "SKYMNT02"
 	music = "D_STRIKE"
 	cluster = 1
-	redirect = "Sigil"
-, "map10"
+	redirect = "Sigil", "map10"
 }
 
 map MAP08 "AREA 8: Audience Chamber"
 {
 	next = "MAP09"
-	sky1 = "SKYMNT02", 0
+	sky1 = "SKYMNT02"
 	music = "D_SLIDE"
 	cluster = 1
 }
@@ -123,10 +122,12 @@ map MAP08 "AREA 8: Audience Chamber"
 map MAP09 "AREA 9: Castle: Programmer's Keep"
 {
 	next = "MAP10"
-	sky1 = "SKYMNT02", 0
+	sky1 = "SKYMNT02"
 	music = "D_TRIBAL"
 	cluster = 1
-// These are the sky changes for the first 8 maps

+
+	// These are the sky changes for the first 8 maps
+
 	specialaction = "Programmer", "ACS_Execute", 0, 1, 256
 	specialaction = "Programmer", "ACS_Execute", 0, 2, 256
 	specialaction = "Programmer", "ACS_Execute", 0, 3, 256
@@ -134,16 +135,17 @@ map MAP09 "AREA 9: Castle: Programmer's Keep"
 	specialaction = "Programmer", "ACS_Execute", 0, 5, 256
 	specialaction = "Programmer", "ACS_Execute", 0, 6, 256
 	specialaction = "Programmer", "ACS_Execute", 0, 7, 256
-	specialaction = "Programmer", "ACS_Execute", 0, 8, 256// It seems that Strife was originally going to print the text

-// from the C1TEXT lump when you move from map 9 to map 10, but

-// that idea apparently got scrapped as the game developed. 

-
+	specialaction = "Programmer", "ACS_Execute", 0, 8, 256
+	
+	// It seems that Strife was originally going to print the text
+	// from the C1TEXT lump when you move from map 9 to map 10, but
+	// that idea apparently got scrapped as the game developed. 
 }
 
 map MAP10 "AREA 10: New Front Base"
 {
 	next = "MAP11"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_MARCH"
 	cluster = 1
 }
@@ -151,7 +153,7 @@ map MAP10 "AREA 10: New Front Base"
 map MAP11 "AREA 11: Borderlands"
 {
 	next = "MAP12"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_DANGER"
 	cluster = 1
 }
@@ -159,7 +161,7 @@ map MAP11 "AREA 11: Borderlands"
 map MAP12 "AREA 12: the temple of the oracle"
 {
 	next = "MAP13"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_MOOD"
 	cluster = 1
 }
@@ -167,7 +169,7 @@ map MAP12 "AREA 12: the temple of the oracle"
 map MAP13 "AREA 13: Catacombs"
 {
 	next = "MAP14"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_CASTLE"
 	cluster = 1
 }
@@ -175,7 +177,7 @@ map MAP13 "AREA 13: Catacombs"
 map MAP14 "AREA 14: mines"
 {
 	next = "MAP15"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_DARKER"
 	cluster = 1
 }
@@ -183,7 +185,7 @@ map MAP14 "AREA 14: mines"
 map MAP15 "AREA 15: Fortress: Administration"
 {
 	next = "MAP16"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_ACTION"
 	cluster = 1
 }
@@ -191,7 +193,7 @@ map MAP15 "AREA 15: Fortress: Administration"
 map MAP16 "AREA 16: Fortress: Bishop's Tower"
 {
 	next = "MAP17"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_FIGHT"
 	cluster = 1
 }
@@ -199,7 +201,7 @@ map MAP16 "AREA 16: Fortress: Bishop's Tower"
 map MAP17 "AREA 17: Fortress: The Bailey"
 {
 	next = "MAP18"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_SPENSE"
 	cluster = 1
 }
@@ -207,7 +209,7 @@ map MAP17 "AREA 17: Fortress: The Bailey"
 map MAP18 "AREA 18: Fortress: Stores"
 {
 	next = "MAP19"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_SLIDE"
 	cluster = 1
 }
@@ -215,7 +217,7 @@ map MAP18 "AREA 18: Fortress: Stores"
 map MAP19 "AREA 19: Fortress: Security Complex"
 {
 	next = "MAP20"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_STRIKE"
 	cluster = 1
 }
@@ -223,7 +225,7 @@ map MAP19 "AREA 19: Fortress: Security Complex"
 map MAP20 "AREA 20: Factory: Receiving"
 {
 	next = "MAP21"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_DARK"
 	cluster = 1
 }
@@ -231,7 +233,7 @@ map MAP20 "AREA 20: Factory: Receiving"
 map MAP21 "AREA 21: Factory: Manufacturing"
 {
 	next = "MAP22"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_TECH"
 	cluster = 1
 }
@@ -239,7 +241,7 @@ map MAP21 "AREA 21: Factory: Manufacturing"
 map MAP22 "AREA 22: Factory: Forge"
 {
 	next = "MAP23"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_SLIDE"
 	cluster = 1
 }
@@ -247,7 +249,7 @@ map MAP22 "AREA 22: Factory: Forge"
 map MAP23 "AREA 23: Order Commons"
 {
 	next = "MAP24"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_DRONE"
 	cluster = 1
 }
@@ -255,7 +257,7 @@ map MAP23 "AREA 23: Order Commons"
 map MAP24 "AREA 24: Factory: Conversion Chapel"
 {
 	next = "MAP25"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_PANTHR"
 	cluster = 1
 }
@@ -263,7 +265,7 @@ map MAP24 "AREA 24: Factory: Conversion Chapel"
 map MAP25 "AREA 25: Catacombs: Ruined Temple"
 {
 	next = "MAP26"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_SAD"
 	cluster = 1
 }
@@ -271,7 +273,7 @@ map MAP25 "AREA 25: Catacombs: Ruined Temple"
 map MAP26 "AREA 26: proving grounds"
 {
 	next = "MAP27"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_INSTRY"
 	cluster = 1
 }
@@ -279,7 +281,7 @@ map MAP26 "AREA 26: proving grounds"
 map MAP27 "AREA 27: The Lab"
 {
 	next = "MAP28"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_TECH"
 	cluster = 1
 }
@@ -287,7 +289,7 @@ map MAP27 "AREA 27: The Lab"
 map MAP28 "AREA 28: Alien Ship"
 {
 	next = "MAP29"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_ACTION"
 	cluster = 1
 }
@@ -295,7 +297,7 @@ map MAP28 "AREA 28: Alien Ship"
 map MAP29 "AREA 29: Entity's Lair"
 {
 	next = "EndGameS"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_INSTRY"
 	cluster = 1
 	deathslideshow
@@ -304,7 +306,7 @@ map MAP29 "AREA 29: Entity's Lair"
 map MAP30 "AREA 30: Abandoned Front Base"
 {
 	next = "MAP31"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_DRONE"
 	cluster = 1
 }
@@ -312,7 +314,7 @@ map MAP30 "AREA 30: Abandoned Front Base"
 map MAP31 "AREA 31: Training Facility"
 {
 	next = "MAP01"
-	sky1 = "SKYMNT01", 0
+	sky1 = "SKYMNT01"
 	music = "D_FIGHT"
 	cluster = 1
 }
@@ -320,7 +322,7 @@ map MAP31 "AREA 31: Training Facility"
 map MAP32 "AREA 1: Sanctuary"
 {
 	next = "MAP33"
-	sky1 = "SKYMNT02", 0
+	sky1 = "SKYMNT02"
 	music = "D_MAP1"
 	cluster = 2
 }
@@ -328,7 +330,7 @@ map MAP32 "AREA 1: Sanctuary"
 map MAP33 "AREA 2: Town"
 {
 	next = "MAP34"
-	sky1 = "SKYMNT02", 0
+	sky1 = "SKYMNT02"
 	music = "D_MAP2"
 	cluster = 2
 }
@@ -336,7 +338,7 @@ map MAP33 "AREA 2: Town"
 map MAP34 "AREA 3: Movement Base"
 {
 	next = "EndBuyStrife"
-	sky1 = "SKYMNT02", 0
+	sky1 = "SKYMNT02"
 	music = "D_MAP3"
 	cluster = 2
 	noallies
@@ -361,4 +363,3 @@ episode MAP02 teaser MAP33
 {
 	name = "Quest for the Sigil"
 }
-
diff --git a/wadsrc/static/mapinfo/tnt.txt b/wadsrc/static/mapinfo/tnt.txt
index d91850fa41..9cd3488aff 100644
--- a/wadsrc/static/mapinfo/tnt.txt
+++ b/wadsrc/static/mapinfo/tnt.txt
@@ -1,5 +1,7 @@
-// MAPINFO for TNT. Exactly the same as Doom 2, except it

-// has different map names and cluster messages.

+// MAPINFO for TNT. Exactly the same as Doom 2, except it
+
+// has different map names and cluster messages.
+
 clearepisodes
 episode map01
 {
@@ -7,15 +9,19 @@ episode map01
 	key = "t"
 }
 
+defaultmap
+{
+	sucktime = 1
+}
+
 map MAP01 lookup "THUSTR_1"
 {
 	titlepatch = "CWILV00"
 	next = "MAP02"
 	secretnext = "MAP02"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 30
-	sucktime = 1
 	music = "$MUSIC_RUNNIN"
 }
 
@@ -24,10 +30,9 @@ map MAP02 lookup "THUSTR_2"
 	titlepatch = "CWILV01"
 	next = "MAP03"
 	secretnext = "MAP03"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 90
-	sucktime = 1
 	music = "$MUSIC_STALKS"
 }
 
@@ -36,10 +41,9 @@ map MAP03 lookup "THUSTR_3"
 	titlepatch = "CWILV02"
 	next = "MAP04"
 	secretnext = "MAP04"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 120
-	sucktime = 1
 	music = "$MUSIC_COUNTD"
 }
 
@@ -48,10 +52,9 @@ map MAP04 lookup "THUSTR_4"
 	titlepatch = "CWILV03"
 	next = "MAP05"
 	secretnext = "MAP05"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 120
-	sucktime = 1
 	music = "$MUSIC_BETWEE"
 }
 
@@ -60,10 +63,9 @@ map MAP05 lookup "THUSTR_5"
 	titlepatch = "CWILV04"
 	next = "MAP06"
 	secretnext = "MAP06"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 90
-	sucktime = 1
 	music = "$MUSIC_DOOM"
 }
 
@@ -72,10 +74,9 @@ map MAP06 lookup "THUSTR_6"
 	titlepatch = "CWILV05"
 	next = "MAP07"
 	secretnext = "MAP07"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 5
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_THE_DA"
 }
 
@@ -84,10 +85,9 @@ map MAP07 lookup "THUSTR_7"
 	titlepatch = "CWILV06"
 	next = "MAP08"
 	secretnext = "MAP08"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 120
-	sucktime = 1
 	map07special
 	music = "$MUSIC_SHAWN"
 }
@@ -97,10 +97,9 @@ map MAP08 lookup "THUSTR_8"
 	titlepatch = "CWILV07"
 	next = "MAP09"
 	secretnext = "MAP09"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 120
-	sucktime = 1
 	music = "$MUSIC_DDTBLU"
 }
 
@@ -109,10 +108,9 @@ map MAP09 lookup "THUSTR_9"
 	titlepatch = "CWILV08"
 	next = "MAP10"
 	secretnext = "MAP10"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 270
-	sucktime = 1
 	music = "$MUSIC_IN_CIT"
 }
 
@@ -121,10 +119,9 @@ map MAP10 lookup "THUSTR_10"
 	titlepatch = "CWILV09"
 	next = "MAP11"
 	secretnext = "MAP11"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 90
-	sucktime = 1
 	music = "$MUSIC_DEAD"
 }
 
@@ -133,10 +130,9 @@ map MAP11 lookup "THUSTR_11"
 	titlepatch = "CWILV10"
 	next = "MAP12"
 	secretnext = "MAP12"
-	sky1 = "SKY1", 0
+	sky1 = "SKY1"
 	cluster = 6
 	par = 210
-	sucktime = 1
 	music = "$MUSIC_STLKS2"
 }
 
@@ -145,10 +141,9 @@ map MAP12 lookup "THUSTR_12"
 	titlepatch = "CWILV11"
 	next = "MAP13"
 	secretnext = "MAP13"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_THEDA2"
 }
 
@@ -157,10 +152,9 @@ map MAP13 lookup "THUSTR_13"
 	titlepatch = "CWILV12"
 	next = "MAP14"
 	secretnext = "MAP14"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_DOOM2"
 }
 
@@ -169,10 +163,9 @@ map MAP14 lookup "THUSTR_14"
 	titlepatch = "CWILV13"
 	next = "MAP15"
 	secretnext = "MAP15"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_DDTBL2"
 }
 
@@ -181,10 +174,9 @@ map MAP15 lookup "THUSTR_15"
 	titlepatch = "CWILV14"
 	next = "MAP16"
 	secretnext = "MAP31"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 210
-	sucktime = 1
 	music = "$MUSIC_RUNNI2"
 }
 
@@ -193,10 +185,9 @@ map MAP16 lookup "THUSTR_16"
 	titlepatch = "CWILV15"
 	next = "MAP17"
 	secretnext = "MAP17"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_DEAD2"
 }
 
@@ -205,10 +196,9 @@ map MAP17 lookup "THUSTR_17"
 	titlepatch = "CWILV16"
 	next = "MAP18"
 	secretnext = "MAP18"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 420
-	sucktime = 1
 	music = "$MUSIC_STLKS3"
 }
 
@@ -217,10 +207,9 @@ map MAP18 lookup "THUSTR_18"
 	titlepatch = "CWILV17"
 	next = "MAP19"
 	secretnext = "MAP19"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_ROMERO"
 }
 
@@ -229,10 +218,9 @@ map MAP19 lookup "THUSTR_19"
 	titlepatch = "CWILV18"
 	next = "MAP20"
 	secretnext = "MAP20"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 210
-	sucktime = 1
 	music = "$MUSIC_SHAWN2"
 }
 
@@ -241,10 +229,9 @@ map MAP20 lookup "THUSTR_20"
 	titlepatch = "CWILV19"
 	next = "MAP21"
 	secretnext = "MAP21"
-	sky1 = "SKY2", 0
+	sky1 = "SKY2"
 	cluster = 7
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_MESSAG"
 }
 
@@ -253,10 +240,9 @@ map MAP21 lookup "THUSTR_21"
 	titlepatch = "CWILV20"
 	next = "MAP22"
 	secretnext = "MAP22"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 240
-	sucktime = 1
 	music = "$MUSIC_COUNT2"
 }
 
@@ -265,10 +251,9 @@ map MAP22 lookup "THUSTR_22"
 	titlepatch = "CWILV21"
 	next = "MAP23"
 	secretnext = "MAP23"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_DDTBL3"
 }
 
@@ -277,10 +262,9 @@ map MAP23 lookup "THUSTR_23"
 	titlepatch = "CWILV22"
 	next = "MAP24"
 	secretnext = "MAP24"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 180
-	sucktime = 1
 	music = "$MUSIC_AMPIE"
 }
 
@@ -289,10 +273,9 @@ map MAP24 lookup "THUSTR_24"
 	titlepatch = "CWILV23"
 	next = "MAP25"
 	secretnext = "MAP25"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_THEDA3"
 }
 
@@ -301,10 +284,9 @@ map MAP25 lookup "THUSTR_25"
 	titlepatch = "CWILV24"
 	next = "MAP26"
 	secretnext = "MAP26"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 150
-	sucktime = 1
 	music = "$MUSIC_ADRIAN"
 }
 
@@ -313,10 +295,9 @@ map MAP26 lookup "THUSTR_26"
 	titlepatch = "CWILV25"
 	next = "MAP27"
 	secretnext = "MAP27"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 300
-	sucktime = 1
 	music = "$MUSIC_MESSG2"
 }
 
@@ -325,10 +306,9 @@ map MAP27 lookup "THUSTR_27"
 	titlepatch = "CWILV26"
 	next = "MAP28"
 	secretnext = "MAP28"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 330
-	sucktime = 1
 	music = "$MUSIC_ROMER2"
 }
 
@@ -337,10 +317,9 @@ map MAP28 lookup "THUSTR_28"
 	titlepatch = "CWILV27"
 	next = "MAP29"
 	secretnext = "MAP29"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 420
-	sucktime = 1
 	music = "$MUSIC_TENSE"
 }
 
@@ -349,10 +328,9 @@ map MAP29 lookup "THUSTR_29"
 	titlepatch = "CWILV28"
 	next = "MAP30"
 	secretnext = "MAP30"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 300
-	sucktime = 1
 	music = "$MUSIC_SHAWN3"
 }
 
@@ -361,10 +339,9 @@ map MAP30 lookup "THUSTR_30"
 	titlepatch = "CWILV29"
 	next = "EndGameC"
 	secretnext = "EndGameC"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 8
 	par = 180
-	sucktime = 1
 	allowmonstertelefrags
 	music = "$MUSIC_OPENIN"
 }
@@ -374,10 +351,9 @@ map MAP31 lookup "THUSTR_31"
 	titlepatch = "CWILV30"
 	next = "MAP16"
 	secretnext = "MAP32"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 9
 	par = 120
-	sucktime = 1
 	music = "$MUSIC_EVIL"
 }
 
@@ -386,10 +362,9 @@ map MAP32 lookup "THUSTR_32"
 	titlepatch = "CWILV31"
 	next = "MAP16"
 	secretnext = "MAP16"
-	sky1 = "SKY3", 0
+	sky1 = "SKY3"
 	cluster = 10
 	par = 30
-	sucktime = 1
 	music = "$MUSIC_ULTIMA"
 }
 
@@ -446,4 +421,3 @@ cluster 10
 	music = "$MUSIC_READ_M"
 	entertext = lookup, "T6TEXT"
 }
-