diff --git a/gr-sim/tfv/tfv_mapinfo.h b/gr-sim/tfv/tfv_mapinfo.h
index 146b1ccd..71db9fa7 100644
--- a/gr-sim/tfv/tfv_mapinfo.h
+++ b/gr-sim/tfv/tfv_mapinfo.h
@@ -199,7 +199,7 @@ struct map_info_type map_info[33] = {
 		.s_exit=NOEXIT,
 		.e_exit=OCEAN_CITY,
 		.w_exit=CACTUS_RANCH,
-		.miny=4,
+		.miny=2,
 		.scatter=SCATTER_NONE,
 		.background_image=collegep_rle,
 		.num_locations=2,
@@ -242,25 +242,25 @@ struct map_info_type map_info[33] = {
 		.num_locations=4,
 		.location[0] = {
 			.name="Talbot Hall",
-			.x0 = 0,  .x1 = 14,
-			.y0 = 18, .y1 = 33,
+			.x0 = 0,  .x1 = 10,
+			.y0 = 18, .y1 = 31,
 			.destination = TALBOT_HALL,
 		},
 		.location[1] = {
 			.name="Dining Hall",
-			.x0 = 19, .x1 = 30,
-			.y0 = 18, .y1 = 26,
+			.x0 = 13, .x1 = 26,
+			.y0 = 10, .y1 = 24,
 			.destination = DINING_HALL,
 		},
 		.location[2] = {
 			.name="Metro Station",
-			.x0 = 32, .x1 = 39,
-			.y0 = 18, .y1 = 39,
+			.x0 = 30, .x1 = 39,
+			.y0 = 10, .y1 = 39,
 			.destination = METRO_STATION,
 		},
 		.location[3] = {
 			.name="Fountain",
-			.x0 = 13, .x1 = 29,
+			.x0 = 14, .x1 = 29,
 			.y0 = 28, .y1 = 39,
 			.destination = FOUNTAIN,
 		},
diff --git a/gr-sim/tfv/tfv_worldmap.c b/gr-sim/tfv/tfv_worldmap.c
index 27f0f5ed..959b33ee 100644
--- a/gr-sim/tfv/tfv_worldmap.c
+++ b/gr-sim/tfv/tfv_worldmap.c
@@ -191,7 +191,7 @@ int world_map(void) {
 		}
 
 		if (ch==13) {
-			if (special_destination) {
+			if (special_destination!=NOEXIT) {
 				map_location=special_destination;
 			}
 			refresh=1;
@@ -433,14 +433,14 @@ int world_map(void) {
 		special_destination=NOEXIT;
 		for(i=0;i<map_info[map_location].num_locations;i++) {
 
-			if ( (tfv_x>map_info[map_location].location[i].x0) &&
-			     (tfv_x<map_info[map_location].location[i].x1) &&
-			     (tfv_y>map_info[map_location].location[i].y0) &&
-			     (tfv_y<map_info[map_location].location[i].y1)) {
+			if ( (tfv_x>=map_info[map_location].location[i].x0) &&
+			     (tfv_x<=map_info[map_location].location[i].x1) &&
+			     (tfv_y+11>=map_info[map_location].location[i].y0) &&
+			     (tfv_y+11<=map_info[map_location].location[i].y1)) {
 
-				ram[CH]=20;
+				ram[CH]=(40-strlen(map_info[map_location].location[i].name))/2;
 				ram[CV]=20;
-				move_and_print(map_info[map_location].name);
+				move_and_print(map_info[map_location].location[i].name);
 
 				special_destination=map_info[map_location].location[i].destination;
 				break;