diff --git a/include/maps.hrl b/include/maps.hrl
index 3f0bac1..61b2041 100644
--- a/include/maps.hrl
+++ b/include/maps.hrl
@@ -19,15 +19,33 @@
 %% EGS maps settings.
 
 -define(MAPS, [
-	{ 1, [{quest, "p/quest.gc1.nbl"}, {zone, "p/zone.gc1.nbl"}] },
-	{ 2, [{quest, "p/quest.gc1.nbl"}, {zone, "p/zone.gc1.nbl"}] },
-	{ 3, [{quest, "p/quest.gc1.nbl"}, {zone, "p/zone.gc1.nbl"}] },
-	{ 4, [{quest, "p/quest.gc1.nbl"}, {zone, "p/zone.gc1.nbl"}] },
-% TODO: 0500 (0000): 5th floor 2032674b too (same as floor1)
-% TODO: 6400 (0000 0100 0200): clyez 2nd floor shops, right
-% TODO: 6500 (0000 0100 0200): clyez 2nd floor shops, left
-% TODO: 6600 (0000 0100 0200): clyez 3rd floor shops, right
-% TODO: 6700 (0000): club commune
-% TODO: 8403 (0000): parum, neudaiz, moatoob spaceports
+	{    1, [{name, "GC Floor 1"}, {quest, "p/quest.gc1.nbl"}, {zone, "p/zone.gc1.nbl"}] },
+	{    2, [{name, "GC Floor 2"}, {quest, "p/quest.gc1.nbl"}, {zone, "p/zone.gc1.nbl"}] },
+	{    3, [{name, "GC Floor 3"}, {quest, "p/quest.gc1.nbl"}, {zone, "p/zone.gc1.nbl"}] },
+	{    4, [{name, "GC Floor 4"}, {quest, "p/quest.gc1.nbl"}, {zone, "p/zone.gc1.nbl"}] },
+	{    5, [{name, "GC Floor 5"}, {quest, "p/quest.gc1.nbl"}, {zone, "p/TODO"}] },
+	{  100, [{name, "GC Floor 2 Shops R"}, {quest, "p/quest.gc1.nbl"}, {zone, "p/TODO"}] }, % entries 0 1 2
+	{  101, [{name, "GC Floor 2 Shops L"}, {quest, "p/quest.gc1.nbl"}, {zone, "p/TODO"}] }, % entries 0 1 2
+	{  102, [{name, "GC Floor 3 Shops R"}, {quest, "p/quest.gc1.nbl"}, {zone, "p/TODO"}] }, % entries 0 1 2
+	{  103, [{name, "GC Club Commune"}, {quest, "p/quest.gc1.nbl"}, {zone, "p/TODO"}] }, % entries 0 1
+	{  900, [{name, "GC Space Port"}, {quest, "p/quest.gc1.nbl"}, {zone, "p/TODO"}] },
 	{ 16#a701, [{quest, "p/quest.myroom.nbl"}, {zone, "p/zone.myroom.nbl"}] } % TODO: 6400 too? on US through a door?
 ]).
+
+% TODO:
+% 100 101 102 103 104 105 106 107 108 109 111 112 113 117 119 120 121 122 123 124 130 131 140
+% 200 201 202 203 204 205 206 208 210 211 212 213 217 219 220 221 222 223 224 230 231
+% 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325
+% 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425
+% 800 801 802
+% 900
+% 1002 1104 1105 1120 1121 1200 1301
+% 2100 2200 2202
+% 3002 3100 3101 3110 3112 3120 3132 3160 3161 3300 3301 3400 3801 3803
+% 4100? 4221 4250 4300 4301 4802 4803 4804
+% 5000 5101 5112 5113 5114 5200 5201 5202 5203 5204 5300 5301 5302 5303 5304 5402 5403 5801 5802 5803 5804 5805 5806 5807 5808
+% 6000 6301 6302 6303 6304 6803
+% 7000
+% 8000 8002
+% 9000 9001 9010 9011 9012 9020 9030 9040 9100 9101 9102 9103 9120 9130 9200 9201 9202 9203 9207 9208 9209 9300 9301 9302 9304 9305 9306 9307 9308
+% and more...
diff --git a/src/egs_game.erl b/src/egs_game.erl
index 31230d6..3df12f1 100644
--- a/src/egs_game.erl
+++ b/src/egs_game.erl
@@ -191,7 +191,7 @@ lobby_load(CSocket, GID, Map, Entry) ->
 	User = OldUser#users{map=Map, entry=Entry},
 	egs_db:users_insert(User),
 	[{status, 1}, {char, Char}, {options, Options}] = char_load(User#users.folder, User#users.charnumber),
-	[{quest, Quest}, {zone, Zone}] = proplists:get_value(Map, ?MAPS, [{quest, "p/quest.gc1.nbl"}, {zone, "p/zone.gc1.nbl"}]),
+	[{name, _}, {quest, Quest}, {zone, Zone}] = proplists:get_value(Map, ?MAPS, [{quest, "p/quest.gc1.nbl"}, {zone, "p/zone.gc1.nbl"}]),
 	try
 		% broadcast spawn to other people
 		lists:foreach(fun(Other) -> Other#users.pid ! {psu_player_spawn, User} end, egs_db:users_select_others(GID)),