diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index 2d372cf2..2ab75830 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -644,14 +644,14 @@ SubSection "Plugins" Plugins
 		SetOutPath "$INSTDIR\plugins"
 		File "..\bin\plugins\SpellChecker.dll"
 	SectionEnd
-
+/*
 	Section "MIME Tools" MIMETools
 		Delete "$INSTDIR\plugins\NppTools.dll"
 		Delete "$INSTDIR\plugins\mimeTools.dll"
 		SetOutPath "$INSTDIR\plugins"
 		File "..\bin\plugins\mimeTools.dll"
 	SectionEnd
-
+*/
 	Section "Npp FTP" NppFTP
 		Delete "$INSTDIR\plugins\NppFTP.dll"
 		SetOutPath "$INSTDIR\plugins"
@@ -671,13 +671,13 @@ SubSection "Plugins" Plugins
 		SetOutPath "$INSTDIR\plugins"
 		File "..\bin\plugins\NppExport.dll"
 	SectionEnd
-
+/*
 	Section "Select 'N' Launch" SelectNLaunch
 		Delete "$INSTDIR\plugins\SelectNLaunch.dll"
 		SetOutPath "$INSTDIR\plugins"
 		File "..\bin\plugins\SelectNLaunch.dll"
 	SectionEnd
-
+*/
 	Section "Compare Plugin" ComparePlugin
 		Delete "$INSTDIR\plugins\ComparePlugin.dll"
 		SetOutPath "$INSTDIR\plugins"
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index 9332ce7a..18c6e0a6 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -283,7 +283,7 @@ LRESULT Notepad_plus::init(HWND hwnd)
     //--Status Bar Section--//
 	bool willBeShown = nppGUI._statusBarShow;
     _statusBar.init(_pPublicInterface->getHinst(), hwnd, 6);
-	_statusBar.setPartWidth(STATUSBAR_DOC_SIZE, 230);
+	_statusBar.setPartWidth(STATUSBAR_DOC_SIZE, 200);
 	_statusBar.setPartWidth(STATUSBAR_CUR_POS, 230);
 	_statusBar.setPartWidth(STATUSBAR_EOF_FORMAT, 110);
 	_statusBar.setPartWidth(STATUSBAR_UNICODE_TYPE, 120);
diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp
index 7df04f39..7fccd0e5 100644
--- a/PowerEditor/src/NppBigSwitch.cpp
+++ b/PowerEditor/src/NppBigSwitch.cpp
@@ -1675,8 +1675,7 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
 			_pPublicInterface->getClientRect(rc);
 			
 			nppGUI._statusBarShow = show;
-			if(show)
-				_statusBar.display(nppGUI._statusBarShow);
+			_statusBar.display(nppGUI._statusBarShow);
             ::SendMessage(_pPublicInterface->getHSelf(), WM_SIZE, SIZE_RESTORED, MAKELONG(rc.bottom, rc.right));
             return oldVal;
         }
diff --git a/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp b/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp
index 5ad753b6..dcb110ff 100644
--- a/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp
+++ b/PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp
@@ -364,7 +364,7 @@ void FunctionCallTip::showCalltip()
 		bytesNeeded += 24;	//  /\00001 of 00003\/
 	}
 
-	const int maxLen = 1024;
+	const int maxLen = 2048;
 	if (bytesNeeded >= maxLen)
 		return;
 
diff --git a/PowerEditor/src/WinControls/shortcut/shortcut.cpp b/PowerEditor/src/WinControls/shortcut/shortcut.cpp
index 22771dc6..f3d0f67d 100644
--- a/PowerEditor/src/WinControls/shortcut/shortcut.cpp
+++ b/PowerEditor/src/WinControls/shortcut/shortcut.cpp
@@ -562,14 +562,16 @@ recordedMacroStep::recordedMacroStep(int iMessage, long wParam, long lParam)
 			case IDREPLACEWITH:
 			case IDD_FINDINFILES_DIR_COMBO:
 			case IDD_FINDINFILES_FILTERS_COMBO:
-				sParameter = *reinterpret_cast<TCHAR *>(lParameter);
-				//::MessageBoxA(NULL, (LPCSTR)(*reinterpret_cast<char *>(lParameter)), "A", MB_OK);
-				//::MessageBoxW(NULL, (LPCWSTR)(*reinterpret_cast<WCHAR *>(lParameter)), TEXT("W"), MB_OK);
-				
-				//printStr(sParameter.c_str());
+			{
+				char ch = *reinterpret_cast<char *>(lParameter);
+				TCHAR tch = ch;
+				sParameter = tch;
+
 				MacroType = mtUseSParameter;
 				lParameter = 0;
-				break;
+			}
+			break;
+
 				
 			default : // for all other messages, use lParameter "as is"
 				break;
diff --git a/PowerEditor/src/localizationString.h b/PowerEditor/src/localizationString.h
index 2f53fac4..36950043 100644
Binary files a/PowerEditor/src/localizationString.h and b/PowerEditor/src/localizationString.h differ