diff --git a/engines/tony/custom.h b/engines/tony/custom.h
index 514af1223cfa..9e18ae20909c 100644
--- a/engines/tony/custom.h
+++ b/engines/tony/custom.h
@@ -18,7 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- *
  */
 
 /*
@@ -37,10 +36,6 @@ namespace Tony {
 
 using namespace MPAL;
 
-/*
- *  Defines
- */
-
 typedef uint32 HWND;
 
 #define INIT_CUSTOM_FUNCTION            MapCustomFunctions
diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp
index 89cf2ffa1be5..901a41b7c41c 100644
--- a/engines/tony/font.cpp
+++ b/engines/tony/font.cpp
@@ -206,7 +206,7 @@ void RMFontDialog::init() {
 
 	load(RES_F_PARL, nchars, 20, 20);
 
-	// Initialize the f**king table
+	// Initialize the font table
 	_lDefault = 13;
 	_hDefault = 18;
 	Common::fill(&_l2Table[0][0], &_l2Table[0][0] + (256 * 256), '\0');
@@ -281,7 +281,7 @@ void RMFontCredits::init() {
 
 
 /***************************************************************************\
-*       Metodi di RMFontObj
+*       RMFontObj Methods
 \****************************************************************************/
 
 #define TOUPPER(a)  ((a) >= 'a' && (a) <= 'z' ? (a) + 'A' - 'a' : (a))
@@ -310,7 +310,7 @@ void RMFontObj::init() {
 
 	load(RES_F_OBJ, nchars, 25, 30);
 
-	// Initialize the f**king table
+	// Initialize the font table
 	_lDefault = 26;
 	_hDefault = 30;
 	Common::fill(&_l2Table[0][0], &_l2Table[0][0] + (256 * 256), '\0');
@@ -320,7 +320,7 @@ void RMFontObj::init() {
 		_lTable[i] = g_vm->_lTableObj[i];
 	}
 
-	/* Casi particolari */
+	// Special case
 	setBothCase('C', 'C', 2);
 	setBothCase('A', 'T', -2);
 	setBothCase('R', 'S', 2);
diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp
index 00aa9c11099b..224427d10f2c 100644
--- a/engines/tony/game.cpp
+++ b/engines/tony/game.cpp
@@ -43,10 +43,7 @@ namespace Tony {
 
 using namespace MPAL;
 
-/****************************************/
-/*  Global functions                    */
-/****************************************/
-
+//  Global functions
 void mainEnableGUI() {
 	g_vm->getEngine()->_bGUIInterface = true;
 	g_vm->getEngine()->_bGUIInventory = true;
@@ -1045,7 +1042,7 @@ void RMOptionScreen::doFrame(CORO_PARAM, RMInput *input) {
 #define PROCESS_CHAR(cod,c)  if (KEYPRESS(cod)) { \
 		_editName[strlen(_editName) + 1] = '\0'; _editName[strlen(_editName)] = c; _ctx->bRefresh = true; }
 
-	/**************** State Buttons **************/
+	// State Buttons
 	if (_bEditSaveName) {
 		if (KEYPRESS(Common::KEYCODE_BACKSPACE)) {
 			if (_editName[0] != '\0') {
diff --git a/engines/tony/gfxcore.cpp b/engines/tony/gfxcore.cpp
index 2e368bbc64b8..53f64aad12c5 100644
--- a/engines/tony/gfxcore.cpp
+++ b/engines/tony/gfxcore.cpp
@@ -1610,7 +1610,7 @@ void RMGfxSourceBuffer8AA::calculateAA() {
 	int x, y;
 	byte *src, *srcaa;
 
-	/* First pass: fill the edges */
+	// First pass: fill the edges
 	Common::fill(_megaAABuf, _megaAABuf + _dimx * _dimy, 0);
 
 	src = _buf;
@@ -1715,11 +1715,9 @@ void RMGfxSourceBuffer8AA::drawAA(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pri
 	// Loop
 	buf += bigBuf.getDimx(); // Skip the first line
 	for (y = 1; y < height - 1; y++) {
-		/*
-		        if (prim->IsFlipped())
-		            mybuf=&buf[x1+m_dimx-1];
-		        else
-		*/
+		// if (prim->IsFlipped())
+		//	mybuf=&buf[x1+m_dimx-1];
+		// else
 		mybuf = &buf[x1];
 
 		for (x = 0; x < width; x++, mybuf += step) {
@@ -1748,18 +1746,16 @@ void RMGfxSourceBuffer8AA::drawAA(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *pri
 		buf += bigBuf.getDimx();
 	}
 
-// Position into the destination buffer
+	// Position into the destination buffer
 	buf = bigBuf;
 	buf += y1 * bigBuf.getDimx();
 
 	// Looppone
 	buf += bigBuf.getDimx();
 	for (y = 1; y < height - 1; y++) {
-		/*
-		        if (prim->IsFlipped())
-		            mybuf=&buf[x1+m_dimx-1];
-		        else
-		*/
+		// if (prim->IsFlipped())
+		// 	mybuf=&buf[x1+m_dimx-1];
+		// else
 		mybuf = &buf[x1];
 
 		for (x = 0; x < width; x++, mybuf += step) {
diff --git a/engines/tony/mpal/expr.cpp b/engines/tony/mpal/expr.cpp
index 5f3026144cbc..31abeb08102a 100644
--- a/engines/tony/mpal/expr.cpp
+++ b/engines/tony/mpal/expr.cpp
@@ -31,10 +31,6 @@
 #include "tony/mpal/mpaldll.h"
 #include "tony/tony.h"
 
-/*
-#include "lzo1x.h"
-*/
-
 namespace Tony {
 
 namespace MPAL {
diff --git a/engines/tony/mpal/loadmpc.cpp b/engines/tony/mpal/loadmpc.cpp
index e23197144b71..9927f9fe8e70 100644
--- a/engines/tony/mpal/loadmpc.cpp
+++ b/engines/tony/mpal/loadmpc.cpp
@@ -145,7 +145,7 @@ static const byte *parseDialog(const byte *lpBuf, LPMPALDIALOG lpmdDialog) {
 	lpmdDialog->nObj = READ_LE_UINT32(lpBuf);
 	lpBuf += 4;
 
-	/* Periods */
+	// Periods
 	uint32 num = READ_LE_UINT16(lpBuf);
 	lpBuf += 2;
 
@@ -166,7 +166,7 @@ static const byte *parseDialog(const byte *lpBuf, LPMPALDIALOG lpmdDialog) {
 	lpmdDialog->_periodNums[i] = 0;
 	lpmdDialog->_periods[i] = NULL;
 
-	/* Groups */
+	// Groups
 	num = READ_LE_UINT16(lpBuf);
 	lpBuf += 2;
 	uint32 curCmd = 0;
@@ -255,7 +255,7 @@ static const byte *parseDialog(const byte *lpBuf, LPMPALDIALOG lpmdDialog) {
 	if (curCmd >= MAX_COMMANDS_PER_DIALOG)
 		error("Too much commands in dialog #%d",lpmdDialog->nObj);
 
-	/* Choices */
+	// Choices
 	num = READ_LE_UINT16(lpBuf);
 	lpBuf += 2;
 
@@ -344,7 +344,7 @@ static const byte *parseItem(const byte *lpBuf, LPMPALITEM lpmiItem) {
 	lpmiItem->nActions=*lpBuf;
 	lpBuf++;
 
-	/* Allocation action */
+	// Allocation action
 	if (lpmiItem->nActions > 0)
 		lpmiItem->Action = (ItemAction *)globalAlloc(GMEM_FIXED | GMEM_ZEROINIT, sizeof(struct ItemAction) * (int)lpmiItem->nActions);
 
@@ -519,7 +519,7 @@ static const byte *ParseLocation(const byte *lpBuf, LPMPALLOCATION lpmlLocation)
 bool ParseMpc(const byte *lpBuf) {
 	byte *lpTemp;
 
-	/* 1. Variables */
+	// 1. Variables
 	if (lpBuf[0] != 'V' || lpBuf[1] != 'A' || lpBuf[2] != 'R' || lpBuf[3] != 'S')
 		return false;
 
@@ -547,7 +547,7 @@ bool ParseMpc(const byte *lpBuf) {
 
 	globalUnlock(GLOBALS._hVars);
 
-	/* 2. Messages */
+	// 2. Messages
 	if (lpBuf[0] != 'M' || lpBuf[1] != 'S' || lpBuf[2] != 'G' || lpBuf[3] != 'S')
 		return false;
 
@@ -596,7 +596,7 @@ bool ParseMpc(const byte *lpBuf) {
 	globalUnlock(GLOBALS._hMsgs);
 #endif
 
-	/* 3. Objects */
+	// 3. Objects
 	if (lpBuf[0] != 'O' || lpBuf[1] != 'B' || lpBuf[2] != 'J' || lpBuf[3] != 'S')
 		return false;
 
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index b4b18749ef41..514001eda70f 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -330,10 +330,10 @@ static char *duplicateDialogPeriod(uint32 nPeriod) {
 
 	for (int j = 0; dialog->_periods[j] != NULL; j++) {
 		if (dialog->_periodNums[j] == nPeriod) {
-			/* Found the phrase, it should be duplicated */
+			// Found the phrase, it should be duplicated
 			origmsg = (const char *)globalLock(dialog->_periods[j]);
 
-			/* Calculate the length and allocate memory */
+			// Calculate the length and allocate memory
 			int i = 0;
 			while (origmsg[i] != '\0')
 				i++;
@@ -408,14 +408,14 @@ static uint32 *getSelectList(uint32 i) {
 	uint32 *sl;
 	LPMPALDIALOG dialog = GLOBALS._lpmdDialogs + GLOBALS._nExecutingDialog;
 
-	/* Count how many are active selects */
+	// Count how many are active selects
 	int num = 0;
 	for (int j = 0; dialog->_choice[i]._select[j].dwData != 0; j++) {
 		if (dialog->_choice[i]._select[j].curActive)
 			num++;
 	}
 
-	/* If there are 0, it's a mistake */
+	// If there are 0, it's a mistake
 	if (num == 0)
 		return NULL;
 
@@ -423,7 +423,7 @@ static uint32 *getSelectList(uint32 i) {
 	if (sl == NULL)
 		return NULL;
 
-	/* Copy all the data inside the active select list */
+	// Copy all the data inside the active select list
 	int k = 0;
 	for (int j = 0; dialog->_choice[i]._select[j].dwData != 0; j++) {
 		if (dialog->_choice[i]._select[j].curActive)
@@ -821,18 +821,18 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 
 	CORO_BEGIN_CODE(_ctx);
 
-	/* Initialize data pointers */
+	// Initialize data pointers
 	_ctx->MyActions = NULL;
 	_ctx->MyThreads = NULL;
 
-	/* To begin with, we need to request the item list from the location */
+	// To begin with, we need to request the item list from the location
 	_ctx->il = mpalQueryItemList(GLOBALS._nPollingLocations[id]);
 
-	/* Count the items */
+	// Count the items
 	for (_ctx->numitems = 0; _ctx->il[_ctx->numitems] != 0; _ctx->numitems++)
 		;
 
-	/* We look for items without idle actions, and eliminate them from the list */
+	// We look for items without idle actions, and eliminate them from the list
 	lockItems();
 	_ctx->nIdleActions = 0;
 	_ctx->nRealItems = 0;
@@ -853,14 +853,14 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 		_ctx->nIdleActions += _ctx->k;
 
 		if (_ctx->k == 0)
-			/* We can remove this item from the list */
+			// We can remove this item from the list
 			_ctx->il[_ctx->i] = (uint32)NULL;
 		else
 			_ctx->nRealItems++;
 	}
 	unlockItems();
 
-	/* If there is nothing left, we can exit */
+	// If there is nothing left, we can exit
 	if (_ctx->nRealItems == 0) {
 		globalDestroy(_ctx->il);
 		CORO_KILL_SELF();
@@ -875,8 +875,8 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 	}
 
 
-	/* We have established that there is at least one item that contains idle actions.
-	   Now we created the mirrored copies of the idle actions. */
+	// We have established that there is at least one item that contains idle actions.
+	// Now we created the mirrored copies of the idle actions.
 	_ctx->MyActions = (MYACTION *)globalAlloc(GMEM_FIXED | GMEM_ZEROINIT, _ctx->nIdleActions * sizeof(MYACTION));
 	if (_ctx->MyActions == NULL) {
 		globalDestroy(_ctx->MyThreads);
@@ -914,11 +914,11 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 
 	unlockItems();
 
-	/* We don't need the item list anymore */
+	// We don't need the item list anymore
 	globalDestroy(_ctx->il);
 
 
-	/* Here's the main loop */
+	// Here's the main loop
 	while (1) {
 		// Searching for idle actions requiring time to execute
 		_ctx->curTime = g_vm->getTime();
@@ -932,7 +932,7 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 				_ctx->dwSleepTime = MIN(_ctx->dwSleepTime, _ctx->MyActions[_ctx->k].dwLastTime + _ctx->MyActions[_ctx->k].wTime - _ctx->curTime);
 		}
 
-		/* We fall alseep, but always checking that the event is set when prompted for closure */
+		// We fall alseep, but always checking that the event is set when prompted for closure
 		CORO_INVOKE_3(CoroScheduler.waitForSingleObject, GLOBALS._hEndPollingLocations[id], _ctx->dwSleepTime, &_ctx->expired);
 
 		//if (_ctx->k == WAIT_OBJECT_0)
@@ -951,19 +951,19 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 
 		_ctx->curTime = g_vm->getTime();
 
-		/* Loop through all the necessary idle actions */
+		// Loop through all the necessary idle actions
 		for (_ctx->k = 0; _ctx->k < _ctx->nIdleActions; _ctx->k++) {
 			if (_ctx->curTime >= _ctx->MyActions[_ctx->k].dwLastTime + _ctx->MyActions[_ctx->k].wTime) {
 				_ctx->MyActions[_ctx->k].dwLastTime += _ctx->MyActions[_ctx->k].wTime;
 
-			   /* It's time to check to see if fortune is on the side of the idle action */
+			   // It's time to check to see if fortune is on the side of the idle action
 				byte randomVal = (byte)g_vm->_randomSource.getRandomNumber(99);
 				if (randomVal < _ctx->MyActions[_ctx->k].perc) {
-					/* Check if there is an action running on the item */
+					// Check if there is an action running on the item
 					if ((GLOBALS._bExecutingAction) && (GLOBALS._nExecutingAction == _ctx->MyActions[_ctx->k].nItem))
 						continue;
 
-					/* Check to see if there already another idle funning running on the item */
+					// Check to see if there already another idle funning running on the item
 					for (_ctx->i = 0; _ctx->i < _ctx->nRealItems; _ctx->i++) {
 						if (_ctx->MyThreads[_ctx->i].nItem == _ctx->MyActions[_ctx->k].nItem)
 							break;
@@ -972,11 +972,11 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 					if (_ctx->i < _ctx->nRealItems)
 						continue;
 
-					/* Ok, we are the only ones :) */
+					// Ok, we are the only ones :)
 					lockItems();
 					_ctx->curItem = GLOBALS._lpmiItems + itemGetOrderFromNum(_ctx->MyActions[_ctx->k].nItem);
 
-					/* Check if there is a WhenExecute expression */
+					// Check if there is a WhenExecute expression
 					_ctx->j=_ctx->MyActions[_ctx->k].nAction;
 					if (_ctx->curItem->Action[_ctx->j].when != NULL) {
 						if (!evaluateExpression(_ctx->curItem->Action[_ctx->j].when)) {
@@ -985,7 +985,7 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 						}
 					}
 
-					/* Ok, we can perform the action. For convenience, we do it in a new process */
+					// Ok, we can perform the action. For convenience, we do it in a new process
 					_ctx->newItem = (LPMPALITEM)globalAlloc(GMEM_FIXED | GMEM_ZEROINIT, sizeof(MPALITEM));
 					if (_ctx->newItem == false) {
 						globalDestroy(_ctx->MyThreads);
@@ -998,12 +998,12 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 					memcpy(_ctx->newItem,_ctx->curItem, sizeof(MPALITEM));
 					unlockItems();
 
-					/* We copy the action in #0 */
-//					_ctx->newItem->Action[0].nCmds = _ctx->curItem->Action[_ctx->j].nCmds;
-//					memcpy(_ctx->newItem->Action[0].CmdNum,_ctx->curItem->Action[_ctx->j].CmdNum,_ctx->newItem->Action[0].nCmds*sizeof(_ctx->newItem->Action[0].CmdNum[0]));
+					// We copy the action in #0
+					//_ctx->newItem->Action[0].nCmds = _ctx->curItem->Action[_ctx->j].nCmds;
+					//memcpy(_ctx->newItem->Action[0].CmdNum,_ctx->curItem->Action[_ctx->j].CmdNum,_ctx->newItem->Action[0].nCmds*sizeof(_ctx->newItem->Action[0].CmdNum[0]));
 					_ctx->newItem->dwRes=_ctx->j;
 
-					/* We will create an action, and will provide the necessary details */
+					// We will create an action, and will provide the necessary details
 					for (_ctx->i = 0; _ctx->i < _ctx->nRealItems; _ctx->i++) {
 						if (_ctx->MyThreads[_ctx->i].nItem == 0)
 							break;
@@ -1022,7 +1022,7 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 						return;
 					}
 
-					/* Skip all idle actions of the same item */
+					// Skip all idle actions of the same item
 				}
 			}
 		}
@@ -1036,11 +1036,10 @@ void LocationPollThread(CORO_PARAM, const void *param) {
 		if (_ctx->MyThreads[_ctx->i].nItem != 0) {
 			CORO_INVOKE_3(CoroScheduler.waitForSingleObject, _ctx->MyThreads[_ctx->i].hThread, 5000, &_ctx->delayExpired);
 
-/*
 			//if (result != WAIT_OBJECT_0)
-			if (_ctx->delayExpired)
-				TerminateThread(_ctx->MyThreads[_ctx->i].hThread, 0);
-*/
+			//if (_ctx->delayExpired)
+			//	TerminateThread(_ctx->MyThreads[_ctx->i].hThread, 0);
+
 			CoroScheduler.killMatchingProcess(_ctx->MyThreads[_ctx->i].hThread);
 		}
 	}
@@ -1142,15 +1141,15 @@ void GroupThread(CORO_PARAM, const void *param) {
 				}
 			}
 
-			/* The gruop is finished, so we can return to the calling function.
-			 * If the group was the first called, then the process will automatically
-			 * end. Otherwise it returns to the caller method
-			 */
+			// The gruop is finished, so we can return to the calling function.
+			// If the group was the first called, then the process will automatically
+			// end. Otherwise it returns to the caller method
+
 			return;
 		}
 	}
 
-	/* If we are here, it means that we have not found the requested group */
+	// If we are here, it means that we have not found the requested group
 	GLOBALS._mpalError = 1;
 	unlockDialogs();
 
@@ -1174,21 +1173,21 @@ void doChoice(CORO_PARAM, uint32 nChoice) {
 
 	CORO_BEGIN_CODE(_ctx);
 
-	/* Lock the dialogs */
+	// Lock the dialogs
 	lockDialogs();
 
-	/* Get a pointer to the current dialog */
+	// Get a pointer to the current dialog
 	_ctx->dialog = GLOBALS._lpmdDialogs + GLOBALS._nExecutingDialog;
 
-	/* Search the choice between those required in the dialog */
+	// Search the choice between those required in the dialog
 	for (_ctx->i = 0; _ctx->dialog->_choice[_ctx->i].nChoice != 0; _ctx->i++) {
 		if (_ctx->dialog->_choice[_ctx->i].nChoice == nChoice)
 			break;
 	}
 
-	/* If nothing has been found, exit with an error */
+	// If nothing has been found, exit with an error
 	if (_ctx->dialog->_choice[_ctx->i].nChoice == 0) {
-		/* If we're here, we did not find the required choice */
+		// If we're here, we did not find the required choice
 		GLOBALS._mpalError = 1;
 		unlockDialogs();
 
@@ -1196,14 +1195,14 @@ void doChoice(CORO_PARAM, uint32 nChoice) {
 		return;
 	}
 
-	/* We've found the requested choice. Remember what in global variables */
+	// We've found the requested choice. Remember what in global variables
 	GLOBALS._nExecutingChoice = _ctx->i;
 
 	while (1) {
 		GLOBALS._nExecutingChoice = _ctx->i;
 
 		_ctx->k = 0;
-		/* Calculate the expression of each selection, to see if they're active or inactive */
+		// Calculate the expression of each selection, to see if they're active or inactive
 		for (_ctx->j = 0; _ctx->dialog->_choice[_ctx->i]._select[_ctx->j].dwData != 0; _ctx->j++) {
 			if (_ctx->dialog->_choice[_ctx->i]._select[_ctx->j].when == NULL) {
 				_ctx->dialog->_choice[_ctx->i]._select[_ctx->j].curActive = 1;
@@ -1215,41 +1214,40 @@ void doChoice(CORO_PARAM, uint32 nChoice) {
 				_ctx->dialog->_choice[_ctx->i]._select[_ctx->j].curActive = 0;
 		}
 
-		/* If there are no choices activated, then the dialog is finished. */
+		// If there are no choices activated, then the dialog is finished.
 		if (_ctx->k == 0) {
 			unlockDialogs();
 			break;
 		}
 
-		/* There are choices available to the user, so wait for them to make one */
+		// There are choices available to the user, so wait for them to make one
 		CoroScheduler.resetEvent(GLOBALS._hDoneChoice);
 		CoroScheduler.setEvent(GLOBALS._hAskChoice);
 		CORO_INVOKE_2(CoroScheduler.waitForSingleObject, GLOBALS._hDoneChoice, CORO_INFINITE);
 
-		/* Now that the choice has been made, we can run the groups associated with the choice tbontbtitq
-		*/
+		// Now that the choice has been made, we can run the groups associated with the choice tbontbtitq
 		_ctx->j = GLOBALS._nSelectedChoice;
 		for (_ctx->k = 0; _ctx->dialog->_choice[_ctx->i]._select[_ctx->j].wPlayGroup[_ctx->k] != 0; _ctx->k++) {
 			_ctx->nGroup = _ctx->dialog->_choice[_ctx->i]._select[_ctx->j].wPlayGroup[_ctx->k];
 			CORO_INVOKE_1(GroupThread, &_ctx->nGroup);
 		}
 
-		/* Control attribute */
+		// Control attribute
 		if (_ctx->dialog->_choice[_ctx->i]._select[_ctx->j].attr & (1 << 0)) {
-			/* Bit 0 set: the end of the choice */
+			// Bit 0 set: the end of the choice
 			unlockDialogs();
 			break;
 		}
 
 		if (_ctx->dialog->_choice[_ctx->i]._select[_ctx->j].attr & (1 << 1)) {
-			/* Bit 1 set: the end of the dialog */
+			// Bit 1 set: the end of the dialog
 			unlockDialogs();
 
 			CORO_KILL_SELF();
 			return;
 		}
 
-		/* End of choic ewithout attributes. We must do it again */
+		// End of choic ewithout attributes. We must do it again
 	}
 
 	// If we're here, we found an end choice. Return to the caller group
@@ -1300,9 +1298,10 @@ static uint32 doAction(uint32 nAction, uint32 ordItem, uint32 dwParam) {
 
 		// In the new version number of the action in writing dwRes
 		Common::copy((byte *)item, (byte *)item + sizeof(MPALITEM), (byte *)newitem);
-/*   newitem->Action[0].nCmds=item->Action[i].nCmds;
-   memcpy(newitem->Action[0].CmdNum,item->Action[i].CmdNum,newitem->Action[0].nCmds*sizeof(newitem->Action[0].CmdNum[0]));
-*/
+
+		//newitem->Action[0].nCmds=item->Action[i].nCmds;
+		//memcpy(newitem->Action[0].CmdNum,item->Action[i].CmdNum,newitem->Action[0].nCmds*sizeof(newitem->Action[0].CmdNum[0]));
+
 		newitem->dwRes = i;
 
 		// And finally we can laucnh the process that will execute the action,
@@ -1412,15 +1411,15 @@ bool mpalInit(const char *lpszMpcFileName, const char *lpszMprFileName,
 	uint32 dwSizeDecomp, dwSizeComp;
 	byte *cmpbuf;
 
-	/* Save the array of custom functions */
+	// Save the array of custom functions
 	GLOBALS._lplpFunctions = lplpcfArray;
 	GLOBALS._lplpFunctionStrings = lpcfStrings;
 
-	/* OPen the MPC file for reading */
+	// OPen the MPC file for reading
 	if (!hMpc.open(lpszMpcFileName))
 		return false;
 
-	/* Read and check the header */
+	// Read and check the header
 	nBytesRead = hMpc.read(buf, 5);
 	if (nBytesRead != 5)
 		return false;
@@ -1430,7 +1429,7 @@ bool mpalInit(const char *lpszMpcFileName, const char *lpszMprFileName,
 
 	bCompress = buf[4];
 
-	/* Reads the size of the uncompressed file, and allocate memory */
+	// Reads the size of the uncompressed file, and allocate memory
 	dwSizeDecomp = hMpc.readUint32LE();
 	if (hMpc.err())
 		return false;
@@ -1440,7 +1439,7 @@ bool mpalInit(const char *lpszMpcFileName, const char *lpszMprFileName,
 		return false;
 
 	if (bCompress) {
-		/* Get the compressed size and read the data in */
+		// Get the compressed size and read the data in
 		dwSizeComp = hMpc.readUint32LE();
 		if (hMpc.err())
 			return false;
@@ -1453,33 +1452,33 @@ bool mpalInit(const char *lpszMpcFileName, const char *lpszMprFileName,
 		if (nBytesRead != dwSizeComp)
 			return false;
 
-		/* Decompress the data */
+		// Decompress the data
 		lzo1x_decompress(cmpbuf, dwSizeComp, lpMpcImage, &nBytesRead);
 		if (nBytesRead != dwSizeDecomp)
 			return false;
 
 		globalDestroy(cmpbuf);
 	} else {
-		/* If the file is not compressed, we directly read in the data */
+		// If the file is not compressed, we directly read in the data
 		nBytesRead = hMpc.read(lpMpcImage, dwSizeDecomp);
 		if (nBytesRead != dwSizeDecomp)
 			return false;
 	}
 
-	/* Close the file */
+	// Close the file
 	hMpc.close();
 
-	/* Process the data */
+	// Process the data
 	if (ParseMpc(lpMpcImage) == false)
 		return false;
 
 	globalDestroy(lpMpcImage);
 
-	/* Open the MPR file */
+	// Open the MPR file
 	if (!GLOBALS._hMpr.open(lpszMprFileName))
 		return false;
 
-	/* Seek to the end of the file to read overall information */
+	// Seek to the end of the file to read overall information
 	GLOBALS._hMpr.seek(-12, SEEK_END);
 
 	dwSizeComp = GLOBALS._hMpr.readUint32LE();
@@ -1497,7 +1496,7 @@ bool mpalInit(const char *lpszMpcFileName, const char *lpszMprFileName,
 	if (buf[0] !='E' || buf[1] != 'N' || buf[2] != 'D' || buf[3] != '0')
 		return false;
 
-	/* Move to the start of the resources header */
+	// Move to the start of the resources header
 	GLOBALS._hMpr.seek(-(12 + (int)dwSizeComp), SEEK_END);
 
 	GLOBALS._lpResources = (uint32 *)globalAlloc(GMEM_FIXED | GMEM_ZEROINIT, GLOBALS._nResources * 8);
@@ -1518,17 +1517,17 @@ bool mpalInit(const char *lpszMpcFileName, const char *lpszMprFileName,
 
 	globalDestroy(cmpbuf);
 
-	/* Reset back to the start of the file, leaving it open */
+	// Reset back to the start of the file, leaving it open
 	GLOBALS._hMpr.seek(0, SEEK_SET);
 
-	/* There is no action or dialog running by default */
+	// There is no action or dialog running by default
 	GLOBALS._bExecutingAction = false;
 	GLOBALS._bExecutingDialog = false;
 
-	/* There's no polling location */
+	// There's no polling location
 	Common::fill(GLOBALS._nPollingLocations, GLOBALS._nPollingLocations + MAXPOLLINGLOCATIONS, 0);
 
-	/* Create the event that will be used to co-ordinate making choices and choices finishing */
+	// Create the event that will be used to co-ordinate making choices and choices finishing
 	GLOBALS._hAskChoice = CoroScheduler.createEvent(true, false);
 	GLOBALS._hDoneChoice = CoroScheduler.createEvent(true, false);
 
diff --git a/engines/tony/mpal/mpal.h b/engines/tony/mpal/mpal.h
index 4c8ca481b0f3..492889d88a11 100644
--- a/engines/tony/mpal/mpal.h
+++ b/engines/tony/mpal/mpal.h
@@ -95,7 +95,7 @@ namespace MPAL {
 *       Macro definitions and structures
 \****************************************************************************/
 
-/* OK value for the error codes */
+// OK value for the error codes
 #define OK      0
 
 #define MAXFRAMES  400        // frame animation of an object
@@ -119,31 +119,31 @@ enum QueryCoordinates {
  * that can do at the library
  */
 enum QueryTypes {
-  /* General Query */
+  // General Query
   MPQ_VERSION=10,
 
   MPQ_GLOBAL_VAR=50,
   MPQ_RESOURCE,
   MPQ_MESSAGE,
 
-  /* Query on leases */
+  // Query on leases
   MPQ_LOCATION_IMAGE=100,
   MPQ_LOCATION_SIZE,
 
-  /* Queries about items */
+  // Queries about items
   MPQ_ITEM_LIST=200,
   MPQ_ITEM_DATA,
   MPQ_ITEM_PATTERN,
   MPQ_ITEM_NAME,
 	MPQ_ITEM_IS_ACTIVE,
 
-  /* Query dialog */
+  // Query dialog
   MPQ_DIALOG_PERIOD=300,
   MPQ_DIALOG_WAITFORCHOICE,
   MPQ_DIALOG_SELECTLIST,
   MPQ_DIALOG_SELECTION,
 
-  /* Query execution */
+  // Query execution
   MPQ_DO_ACTION=400,
   MPQ_DO_DIALOG
 };
diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp
index e8b9dfc42ade..2c2c280eb261 100644
--- a/engines/tony/sound.cpp
+++ b/engines/tony/sound.cpp
@@ -532,7 +532,7 @@ bool FPStream::unloadFile() {
 
 	assert(!g_system->getMixer()->isSoundHandleActive(_handle));
 
-	/* Closes the file handle stream */
+	// Closes the file handle stream
 	delete _loopStream;
 	delete _rewindableStream;
 	_loopStream = NULL;
diff --git a/engines/tony/window.h b/engines/tony/window.h
index 9aaca16d3e29..c4cbcb6643a5 100644
--- a/engines/tony/window.h
+++ b/engines/tony/window.h
@@ -72,7 +72,7 @@ class RMWindow {
 	/**
 	 * Initialization
 	 */
-	void init(/*HINSTANCE hInst*/);
+	void init();
 	void close();
 
 	/**