diff --git a/osx/classes/monster.cpp b/osx/classes/monster.cpp
index b55351bb..c01e8cdc 100644
--- a/osx/classes/monster.cpp
+++ b/osx/classes/monster.cpp
@@ -66,8 +66,8 @@ cMonster::cMonster(){
 }
 
 cCreature::cCreature(){
-	//		short personality;
-	//		short special_on_kill,facial_pic;
+//	short personality;
+//	short special_on_kill,facial_pic;
 	//{-1,-1,-1}
 	id = number = active = attitude = start_attitude = 0;
 	start_loc.x = start_loc.y = cur_loc.x = cur_loc.y = targ_loc.x = targ_loc.y = 80;
diff --git a/osx/classes/regtown.cpp b/osx/classes/regtown.cpp
index 25b5b3dd..054f6543 100644
--- a/osx/classes/regtown.cpp
+++ b/osx/classes/regtown.cpp
@@ -38,22 +38,22 @@ void cTinyTown::append(legacy::tiny_tr_type& old){
 		_room_rect[i].right = old.room_rect[i].right;
 	}
 	for (i = 0; i < 30; i++) {
-		//		_creatures[i].number = old.creatures[i].number;
-		//		_creatures[i].start_attitude = old.creatures[i].start_attitude;
-		//		_creatures[i].start_loc.x = old.creatures[i].start_loc.x;
-		//		_creatures[i].start_loc.y = old.creatures[i].start_loc.y;
-		//		_creatures[i].mobile = old.creatures[i].mobile;
-		//		_creatures[i].time_flag = old.creatures[i].time_flag;
-		//		_creatures[i].extra1 = old.creatures[i].extra1;
-		//		_creatures[i].extra2 = old.creatures[i].extra2;
-		//		_creatures[i].spec1 = old.creatures[i].spec1;
-		//		_creatures[i].spec2 = old.creatures[i].spec2;
-		//		_creatures[i].spec_enc_code = old.creatures[i].spec_enc_code;
-		//		_creatures[i].time_code = old.creatures[i].time_code;
-		//		_creatures[i].monster_time = old.creatures[i].monster_time;
-		//		_creatures[i].personality = old.creatures[i].personality;
-		//		_creatures[i].special_on_kill = old.creatures[i].special_on_kill;
-		//		_creatures[i].facial_pic = old.creatures[i].facial_pic;
+//		_creatures[i].number = old.creatures[i].number;
+//		_creatures[i].start_attitude = old.creatures[i].start_attitude;
+//		_creatures[i].start_loc.x = old.creatures[i].start_loc.x;
+//		_creatures[i].start_loc.y = old.creatures[i].start_loc.y;
+//		_creatures[i].mobile = old.creatures[i].mobile;
+//		_creatures[i].time_flag = old.creatures[i].time_flag;
+//		_creatures[i].extra1 = old.creatures[i].extra1;
+//		_creatures[i].extra2 = old.creatures[i].extra2;
+//		_creatures[i].spec1 = old.creatures[i].spec1;
+//		_creatures[i].spec2 = old.creatures[i].spec2;
+//		_creatures[i].spec_enc_code = old.creatures[i].spec_enc_code;
+//		_creatures[i].time_code = old.creatures[i].time_code;
+//		_creatures[i].monster_time = old.creatures[i].monster_time;
+//		_creatures[i].personality = old.creatures[i].personality;
+//		_creatures[i].special_on_kill = old.creatures[i].special_on_kill;
+//		_creatures[i].facial_pic = old.creatures[i].facial_pic;
 		_creatures[i] = old.creatures[i];
 	}
 }
@@ -79,22 +79,22 @@ void cMedTown::append(legacy::ave_tr_type& old){
 		_room_rect[i].right = old.room_rect[i].right;
 	}
 	for (i = 0; i < 40; i++) {
-		//		_creatures[i].number = old.creatures[i].number;
-		//		_creatures[i].start_attitude = old.creatures[i].start_attitude;
-		//		_creatures[i].start_loc.x = old.creatures[i].start_loc.x;
-		//		_creatures[i].start_loc.y = old.creatures[i].start_loc.y;
-		//		_creatures[i].mobile = old.creatures[i].mobile;
-		//		_creatures[i].time_flag = old.creatures[i].time_flag;
-		//		_creatures[i].extra1 = old.creatures[i].extra1;
-		//		_creatures[i].extra2 = old.creatures[i].extra2;
-		//		_creatures[i].spec1 = old.creatures[i].spec1;
-		//		_creatures[i].spec2 = old.creatures[i].spec2;
-		//		_creatures[i].spec_enc_code = old.creatures[i].spec_enc_code;
-		//		_creatures[i].time_code = old.creatures[i].time_code;
-		//		_creatures[i].monster_time = old.creatures[i].monster_time;
-		//		_creatures[i].personality = old.creatures[i].personality;
-		//		_creatures[i].special_on_kill = old.creatures[i].special_on_kill;
-		//		_creatures[i].facial_pic = old.creatures[i].facial_pic;
+//		_creatures[i].number = old.creatures[i].number;
+//		_creatures[i].start_attitude = old.creatures[i].start_attitude;
+//		_creatures[i].start_loc.x = old.creatures[i].start_loc.x;
+//		_creatures[i].start_loc.y = old.creatures[i].start_loc.y;
+//		_creatures[i].mobile = old.creatures[i].mobile;
+//		_creatures[i].time_flag = old.creatures[i].time_flag;
+//		_creatures[i].extra1 = old.creatures[i].extra1;
+//		_creatures[i].extra2 = old.creatures[i].extra2;
+//		_creatures[i].spec1 = old.creatures[i].spec1;
+//		_creatures[i].spec2 = old.creatures[i].spec2;
+//		_creatures[i].spec_enc_code = old.creatures[i].spec_enc_code;
+//		_creatures[i].time_code = old.creatures[i].time_code;
+//		_creatures[i].monster_time = old.creatures[i].monster_time;
+//		_creatures[i].personality = old.creatures[i].personality;
+//		_creatures[i].special_on_kill = old.creatures[i].special_on_kill;
+//		_creatures[i].facial_pic = old.creatures[i].facial_pic;
 		_creatures[i] = old.creatures[i];
 	}
 }
@@ -120,22 +120,22 @@ void cBigTown::append(legacy::big_tr_type& old){
 		_room_rect[i].right = old.room_rect[i].right;
 	}
 	for (i = 0; i < 60; i++) {
-		//		_creatures[i].number = old.creatures[i].number;
-		//		_creatures[i].start_attitude = old.creatures[i].start_attitude;
-		//		_creatures[i].start_loc.x = old.creatures[i].start_loc.x;
-		//		_creatures[i].start_loc.y = old.creatures[i].start_loc.y;
-		//		_creatures[i].mobile = old.creatures[i].mobile;
-		//		_creatures[i].time_flag = old.creatures[i].time_flag;
-		//		_creatures[i].extra1 = old.creatures[i].extra1;
-		//		_creatures[i].extra2 = old.creatures[i].extra2;
-		//		_creatures[i].spec1 = old.creatures[i].spec1;
-		//		_creatures[i].spec2 = old.creatures[i].spec2;
-		//		_creatures[i].spec_enc_code = old.creatures[i].spec_enc_code;
-		//		_creatures[i].time_code = old.creatures[i].time_code;
-		//		_creatures[i].monster_time = old.creatures[i].monster_time;
-		//		_creatures[i].personality = old.creatures[i].personality;
-		//		_creatures[i].special_on_kill = old.creatures[i].special_on_kill;
-		//		_creatures[i].facial_pic = old.creatures[i].facial_pic;
+//		_creatures[i].number = old.creatures[i].number;
+//		_creatures[i].start_attitude = old.creatures[i].start_attitude;
+//		_creatures[i].start_loc.x = old.creatures[i].start_loc.x;
+//		_creatures[i].start_loc.y = old.creatures[i].start_loc.y;
+//		_creatures[i].mobile = old.creatures[i].mobile;
+//		_creatures[i].time_flag = old.creatures[i].time_flag;
+//		_creatures[i].extra1 = old.creatures[i].extra1;
+//		_creatures[i].extra2 = old.creatures[i].extra2;
+//		_creatures[i].spec1 = old.creatures[i].spec1;
+//		_creatures[i].spec2 = old.creatures[i].spec2;
+//		_creatures[i].spec_enc_code = old.creatures[i].spec_enc_code;
+//		_creatures[i].time_code = old.creatures[i].time_code;
+//		_creatures[i].monster_time = old.creatures[i].monster_time;
+//		_creatures[i].personality = old.creatures[i].personality;
+//		_creatures[i].special_on_kill = old.creatures[i].special_on_kill;
+//		_creatures[i].facial_pic = old.creatures[i].facial_pic;
 		_creatures[i] = old.creatures[i];
 	}
 }
diff --git a/osx/classes/simpletypes.h b/osx/classes/simpletypes.h
index c2f05c26..6e75407e 100644
--- a/osx/classes/simpletypes.h
+++ b/osx/classes/simpletypes.h
@@ -154,30 +154,30 @@ enum eMonstAbil {
 /* Terrains Special Properties : scenario.ter_types[i].special */      //complete
 
 enum eTerSpec {
-	//	TER_SPEC_NONE = 0,
-	//	TER_SPEC_CHANGE_WHEN_STEP_ON = 1,
-	//	TER_SPEC_DOES_FIRE_DAMAGE = 2,
-	//	TER_SPEC_DOES_COLD_DAMAGE = 3,
-	//	TER_SPEC_DOES_MAGIC_DAMAGE = 4,
-	//	TER_SPEC_POISON_LAND = 5,
-	//	TER_SPEC_DISEASED_LAND = 6,
-	//	TER_SPEC_CRUMBLING_TERRAIN = 7,
-	//	TER_SPEC_LOCKABLE_TERRAIN = 8,
-	//	TER_SPEC_UNLOCKABLE_TERRAIN = 9,
-	//	TER_SPEC_UNLOCKABLE_BASHABLE = 10,
-	//	TER_SPEC_IS_A_SIGN = 11,
-	//	TER_SPEC_CALL_LOCAL_SPECIAL = 12,
-	//	TER_SPEC_CALL_SCENARIO_SPECIAL = 13,
-	//	TER_SPEC_IS_A_CONTAINER = 14,
-	//	TER_SPEC_WATERFALL = 15,
-	//	TER_SPEC_CONVEYOR_NORTH = 16,
-	//	TER_SPEC_CONVEYOR_EAST = 17,
-	//	TER_SPEC_CONVEYOR_SOUTH = 18,
-	//	TER_SPEC_CONVEYOR_WEST = 19,
-	//	TER_SPEC_BLOCKED_TO_MONSTERS = 20,
-	//	TER_SPEC_TOWN_ENTRANCE = 21,
-	//	TER_SPEC_CHANGE_WHEN_USED = 22,
-	//	TER_SPEC_CALL_SPECIAL_WHEN_USED = 23,
+//	TER_SPEC_NONE = 0,
+//	TER_SPEC_CHANGE_WHEN_STEP_ON = 1,
+//	TER_SPEC_DOES_FIRE_DAMAGE = 2,
+//	TER_SPEC_DOES_COLD_DAMAGE = 3,
+//	TER_SPEC_DOES_MAGIC_DAMAGE = 4,
+//	TER_SPEC_POISON_LAND = 5,
+//	TER_SPEC_DISEASED_LAND = 6,
+//	TER_SPEC_CRUMBLING_TERRAIN = 7,
+//	TER_SPEC_LOCKABLE_TERRAIN = 8,
+//	TER_SPEC_UNLOCKABLE_TERRAIN = 9,
+//	TER_SPEC_UNLOCKABLE_BASHABLE = 10,
+//	TER_SPEC_IS_A_SIGN = 11,
+//	TER_SPEC_CALL_LOCAL_SPECIAL = 12,
+//	TER_SPEC_CALL_SCENARIO_SPECIAL = 13,
+//	TER_SPEC_IS_A_CONTAINER = 14,
+//	TER_SPEC_WATERFALL = 15,
+//	TER_SPEC_CONVEYOR_NORTH = 16,
+//	TER_SPEC_CONVEYOR_EAST = 17,
+//	TER_SPEC_CONVEYOR_SOUTH = 18,
+//	TER_SPEC_CONVEYOR_WEST = 19,
+//	TER_SPEC_BLOCKED_TO_MONSTERS = 20,
+//	TER_SPEC_TOWN_ENTRANCE = 21,
+//	TER_SPEC_CHANGE_WHEN_USED = 22,
+//	TER_SPEC_CALL_SPECIAL_WHEN_USED = 23,
 	TER_SPEC_NONE = 0,
 	TER_SPEC_CHANGE_WHEN_STEP_ON = 1,
 	TER_SPEC_DAMAGING = 2,
diff --git a/osx/tools/fileio.cpp b/osx/tools/fileio.cpp
index af6dcb81..08398c05 100644
--- a/osx/tools/fileio.cpp
+++ b/osx/tools/fileio.cpp
@@ -240,8 +240,8 @@ bool load_town(short which_town, cTown*& the_town){
 	legacy::ave_tr_type ave_t;
 	legacy::tiny_tr_type tiny_t;
 	
-	//	if (overall_mode == 61)
-	//		return;
+//	if (overall_mode == 61)
+//		return;
 	
 	if (which_town != minmax(0,scenario.num_towns - 1,which_town)) {
 		// This should never be reached from the scenario editor,
@@ -325,7 +325,7 @@ bool load_town(short which_town, cTown*& the_town){
 		the_town->talking.talk_strs[i][len] = 0;
 	}
 	
-	//	town_type = scenario.town_size[which_town];
+//	town_type = scenario.town_size[which_town];
 	n = fclose(file_id);
 	if(n != 0) {
 		oopsError(18, 0, 0);
@@ -349,8 +349,8 @@ bool load_town(short which_town, cSpeech*& the_talk){
 	legacy::town_record_type store_town;
 	legacy::talking_record_type store_talk;
 	
-	//	if (overall_mode == 61)
-	//		return;
+//	if (overall_mode == 61)
+//		return;
 	
 	if (which_town != minmax(0,scenario.num_towns - 1,which_town)) {
 		// This should never be reached from the scenario editor,
@@ -416,7 +416,7 @@ bool load_town(short which_town, cSpeech*& the_talk){
 		the_talk->talk_strs[i][len] = 0;
 	}
 	
-	//	town_type = scenario.town_size[which_town];
+//	town_type = scenario.town_size[which_town];
 	n = fclose(file_id);
 	if(n != 0) {
 		oopsError(23, 0, 0);
@@ -430,8 +430,8 @@ bool load_town_str(short which_town, short which_str, char* str){
 	long len,len_to_jump = 0;
 	legacy::town_record_type store_town;
 	
-	//	if (overall_mode == 61)
-	//		return;
+//	if (overall_mode == 61)
+//		return;
 
 	FILE* file_id = fopen(scenario.scen_file.c_str(), "rb");
 	if(file_id == NULL) {
@@ -479,7 +479,7 @@ bool load_town_str(short which_town, short which_str, char* str){
 		else fseek(file_id, len, SEEK_CUR);
 	}
 	
-	//	town_type = scenario.town_size[which_town];
+//	town_type = scenario.town_size[which_town];
 	n = fclose(file_id);
 	if(n != 0) {
 		oopsError(27, 0, 0);
@@ -493,8 +493,8 @@ bool load_town_str(short which_town, cTown*& t){
 	long len,len_to_jump = 0;
 	legacy::town_record_type store_town;
 	
-	//	if (overall_mode == 61)
-	//		return;
+//	if (overall_mode == 61)
+//		return;
 	
 	FILE* file_id = fopen(scenario.scen_file.c_str(), "rb");
 	if(file_id == NULL) {
@@ -538,7 +538,7 @@ bool load_town_str(short which_town, cTown*& t){
 		t->town_strs(i)[len] = 0;
 	}
 	
-	//	town_type = scenario.town_size[which_town];
+//	town_type = scenario.town_size[which_town];
 	n = fclose(file_id);
 	if(n != 0) {
 		oopsError(31, 0, 0);
@@ -823,8 +823,8 @@ bool load_party(fs::path file_to_load){
 	
 	len = sizeof(flags); // 10
 	
-	//	sprintf((char *) debug, "  Len %d               ", (short) len);
-	//	add_string_to_buf((char *) debug);
+//	sprintf((char *) debug, "  Len %d               ", (short) len);
+//	add_string_to_buf((char *) debug);
 	
 	n = fread(&flags, len, 1, file_id);
 	if(n < 1) {