diff --git a/Blades of Exile/COMBAT.CPP b/Blades of Exile/COMBAT.CPP
index 450341dc..5f6a1e49 100644
--- a/Blades of Exile/COMBAT.CPP	
+++ b/Blades of Exile/COMBAT.CPP	
@@ -301,12 +301,12 @@ void pc_attack(short who_att,short target)
 		
 
 	if ((skill_item = text_pc_has_abil_equip(who_att,37)) < 24) {
-		hit_adj += 5 * (adven[who_att].items[skill_item].item_level / 2 + 1);
-		dam_adj += adven[who_att].items[skill_item].item_level / 2;
+		hit_adj += 5 * (adven[who_att].items[skill_item].ability_strength / 2 + 1);
+		dam_adj += adven[who_att].items[skill_item].ability_strength / 2;
 		}
 	if ((skill_item = text_pc_has_abil_equip(who_att,43)) < 24) {
-		dam_adj += adven[who_att].items[skill_item].item_level;
-		hit_adj += adven[who_att].items[skill_item].item_level * 2;
+		dam_adj += adven[who_att].items[skill_item].ability_strength;
+		hit_adj += adven[who_att].items[skill_item].ability_strength * 2;
 		}
 
 	void_sanctuary(who_att);
diff --git a/Blades of Exile/SPECIALS.CPP b/Blades of Exile/SPECIALS.CPP
index 305bf0a1..5cbcbd01 100644
--- a/Blades of Exile/SPECIALS.CPP	
+++ b/Blades of Exile/SPECIALS.CPP	
@@ -237,8 +237,11 @@ Boolean check_special_terrain(location where_check,short mode,short which_pc,sho
 				can_enter = FALSE;
 			break;
 		case 2: case 3:case 4:
-			if (party.isFlying() || party.in_boat >= 0)
+			if (party.isFlying() || party.in_boat >= 0 || party.in_horse >= 0)
 				break;
+			for(i=0;i<30;i++)//boat at this point ?
+    			if(same_point(party.boats[i].boat_loc,where_check))
+            		    return TRUE;
 			if (ter_special == 2) {
 				add_string_to_buf("  It's hot!");
 				dam_type = 1; pic_type = 0;
@@ -264,9 +267,12 @@ Boolean check_special_terrain(location where_check,short mode,short which_pc,sho
 			fast_bang = 0;
 			break;
 		case 5: case 6:
-			if (party.isFlying()) break;
-			if (party.in_boat >= 0)
+			if (party.isFlying() || party.in_horse >= 0) break;
+			if (party.in_boat >= 0 )
 				return TRUE;
+           	for(i=0;i<30;i++)//boat at this point ?
+    			if(same_point(party.boats[i].boat_loc,where_check))
+            		    return TRUE;
 			one_sound(17);
 			if (mode < 2) {
 				for (i = 0; i < 6; i++) 
diff --git a/Scenarios Editor/TFILEIO.CPP b/Scenarios Editor/TFILEIO.CPP
index 860d6adf..f53ee2b2 100644
--- a/Scenarios Editor/TFILEIO.CPP	
+++ b/Scenarios Editor/TFILEIO.CPP	
@@ -1235,11 +1235,11 @@ void oops_error(short error)
 
 void start_data_dump()
 {
-	short i,j;
+	short i,j,last_town = cur_town;
 	char get_text[280];
 	HFILE data_dump_file_id;
 	long len;
-	location out_sec;
+	location out_sec,last_out = cur_out;
 	if (HFILE_ERROR == (data_dump_file_id = _lcreat("Scendata.txt", 0))) {
 			SysBeep(50);
 			return;
@@ -1338,10 +1338,8 @@ void start_data_dump()
 			}
 		}
 	}
-		out_sec.x = scenario.last_out_edited.x;
-		out_sec.y = scenario.last_out_edited.y;
-		load_outdoors(out_sec,0);
-		load_town(scenario.last_town_edited);
+		load_outdoors(last_out,0);
+		load_town(last_town);
 
 	_lclose(data_dump_file_id);
 
@@ -1349,14 +1347,12 @@ void start_data_dump()
 
 void start_shopping_data_dump()
 {
-	short i;
-	short j;
-	short count;
+	short i,j,last_town = cur_town,count;
 	char res[256];
 	char get_text[280];
 	HFILE data_dump_file_id;
 	long len;
-	location out_sec;
+	location out_sec,last_out = cur_out;
 	if (HFILE_ERROR == (data_dump_file_id = _lcreat("Scenario Shopping.txt", 0))) {
 			SysBeep(50);
 			return;
@@ -1618,10 +1614,8 @@ void start_shopping_data_dump()
 			len = (long) (strlen(get_text));
 			FSWrite(data_dump_file_id, &len, get_text);	
 
-		out_sec.x = scenario.last_out_edited.x;
-		out_sec.y = scenario.last_out_edited.y;
-		load_outdoors(out_sec,0);
-		load_town(scenario.last_town_edited);
+		load_outdoors(last_out,0);
+		load_town(last_town);
 
 	_lclose(data_dump_file_id);
 
@@ -1629,11 +1623,11 @@ void start_shopping_data_dump()
 
 void scen_text_dump()
 {
-	short i,j;
+	short i,j,last_town = cur_town;
 	HFILE data_dump_file_id;
 	char get_text[300];
 	long len;
-	location out_sec;
+	location out_sec,last_out = cur_out;
 	
 	if (HFILE_ERROR == (data_dump_file_id = _lcreat("Scentext.txt", 0))) {
 			SysBeep(50);
@@ -1721,10 +1715,9 @@ void scen_text_dump()
 			len = (long) (strlen((char *)get_text));
 			FSWrite(data_dump_file_id, &len, (char *) get_text);
 		}
-		out_sec.x = scenario.last_out_edited.x;
-		out_sec.y = scenario.last_out_edited.y;
-		load_outdoors(out_sec,0);
-		load_town(scenario.last_town_edited);
+	//		out_sec.y = scenario.last_out_edited.y;
+		load_outdoors(last_out,0);
+		load_town(last_town);
 
 	_lclose(data_dump_file_id);