diff --git a/PowerEditor/src/Notepad_plus.h b/PowerEditor/src/Notepad_plus.h
index cba0be10..9142ff4a 100644
--- a/PowerEditor/src/Notepad_plus.h
+++ b/PowerEditor/src/Notepad_plus.h
@@ -698,9 +698,9 @@ private:
 	};
 
 	bool isWordChar(char ch) const {
-		if (ch < 0x20) 
+		if ((unsigned char)ch < 0x20) 
 			return false;
-
+		
 		switch(ch)
 		{
 			case ' ':
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
index a38217b1..ba2c89e9 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
@@ -1164,7 +1164,7 @@ int FindReplaceDlg::processAll(ProcessOperation op, const char *txt2find, const
 				_line[nbChar+2] = '\0';
 
 				const char *pLine;
-				if (isUnicode)
+				if (!isUnicode)
 				{
 					ascii_to_utf8(_line, (nbChar + 3), _uniCharLine);
 					pLine = _uniCharLine;
@@ -1173,6 +1173,7 @@ int FindReplaceDlg::processAll(ProcessOperation op, const char *txt2find, const
 				{
 					pLine = _line;
 				}
+				//printStr(isUnicode?"unicode":"no unicode");
 				_pFinder->add(FoundInfo(start, end, pLine, fileName, _pFinder->_lineCounter), lineNumber + 1);
 
 				startPosition = posFind + foundTextLen;
@@ -1235,7 +1236,7 @@ int FindReplaceDlg::processAll(ProcessOperation op, const char *txt2find, const
 				delete [] pTextFind;
 				delete [] pTextReplace;
 				return nbReplaced;
-				break; }
+			}
 			
 		}	
 
@@ -1293,10 +1294,8 @@ void FindReplaceDlg::findAllIn(InWhat op)
 
 		// overwrite some default settings
 		_pFinder->_scintView.showMargin(ScintillaEditView::_SC_MARGE_SYBOLE, false);
-
 		_pFinder->_scintView.setMakerStyle(FOLDER_STYLE_SIMPLE);
 
-		//_pFinder->_scintView.execute(SCI_SETZOOM, _pFinder->_scintView.execute(SCI_GETZOOM) - 2);
 		_pFinder->_scintView.display();
 		_pFinder->display();
 	}
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
index fa60aa61..fb1f5419 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
@@ -274,7 +274,6 @@ public :
 	void getPatterns(vector<string> & patternVect);
 
 	void launchFindInFilesDlg() {
-		//::SendMessage(_hSelf, WM_COMMAND, IDC_FINDINFILES, 0);
 		doDialog(FINDINFILES_DLG);
 	};
 
@@ -406,8 +405,6 @@ private :
 	ReBar * _pRebar;
 	REBARBANDINFO _rbBand;
 
-	//HWND _hEditBox, _hSearchPrev, _hSearchNext, _hCheckCase, _hCheckHiLiteAll;
-
 	bool _doSearchFromBegin;
 	virtual BOOL CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
 	void markSelectedTextInc(bool enable, FindOption *opt = NULL);
diff --git a/PowerEditor/src/stylers.model.xml b/PowerEditor/src/stylers.model.xml
index 013f9f78..90fae55c 100644
--- a/PowerEditor/src/stylers.model.xml
+++ b/PowerEditor/src/stylers.model.xml
@@ -2,9 +2,6 @@
 <NotepadPlus>
     <LexerStyles>
         <LexerType name="actionscript" desc="ActionScript" ext="">
-            <!--
-            <WordsStyle name="DIRECTIVE" styleID="19" fgColor="A001D6" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" keywordClass="instre2" />
-			-->
             <WordsStyle name="DEFAULT" styleID="11" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="FUNCTION" styleID="20" fgColor="95004A" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" keywordClass="type2" />
             <WordsStyle name="PREPROCESSOR" styleID="9" fgColor="804000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />