diff --git a/uppbox/Scripts/updateinfo.txt b/uppbox/Scripts/updateinfo.txt
index e55ca6432..d9d0a6aa8 100644
--- a/uppbox/Scripts/updateinfo.txt
+++ b/uppbox/Scripts/updateinfo.txt
@@ -107,11 +107,11 @@ nasm, strawberry perl
 
 make sure Scripts folder is on windows path (needs restart)
 
-from perl prompt run
+from perl prompt
 
 check echo %PATH%
 
-vc32.bat
+vc32.bat (use msvs*.bm file to update, do not forget %PATH%;)
 
 unpack openssl into new dir (it seems there is a problem reusing it in mingw64)
 
diff --git a/uppbox/Scripts/vc32.bat b/uppbox/Scripts/vc32.bat
index 66db69a2b..310bf5965 100644
--- a/uppbox/Scripts/vc32.bat
+++ b/uppbox/Scripts/vc32.bat
@@ -1,3 +1,3 @@
-set PATH=c:/upp/nasm;c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/bin/hostx86/x86;c:/program files (x86)/windows kits/10/bin/10.0.18362.0/x86;C:\\upp\\bin/openssl/bin;C:\\upp\\bin/SDL2/lib/x86;C:\\upp\\bin/pgsql/x86/bin;C:\\upp\\bin/mysql/lib32;%PATH%
-set INCLUDE=c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/include;c:/program files (x86)/windows kits/10/include/10.0.18362.0/um;c:/program files (x86)/windows kits/10/include/10.0.18362.0/ucrt;c:/program files (x86)/windows kits/10/include/10.0.18362.0/shared
-set LIB=c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/lib/x86;c:/program files (x86)/windows kits/10/lib/10.0.18362.0/ucrt/x86;c:/program files (x86)/windows kits/10/lib/10.0.18362.0/um/x86
+set PATH=%PATH%;c:/program files/microsoft visual studio/2022/community/vc/tools/msvc/14.44.35207/bin/hostx86/x86;c:/program files (x86)/windows kits/10/bin/10.0.26100.0/x86;C:\\upp\\bin/SDL2/lib/x86;C:\\upp\\bin/pgsql/x86/bin;C:\\upp\\bin/mysql/lib32
+set INCLUDE=c:/program files/microsoft visual studio/2022/community/vc/tools/msvc/14.44.35207/include;c:/program files (x86)/windows kits/10/include/10.0.26100.0/um;c:/program files (x86)/windows kits/10/include/10.0.26100.0/ucrt;c:/program files (x86)/windows kits/10/include/10.0.26100.0/shared;C:\\upp\\bin/openssl/include;C:\\upp\\bin/SDL2/include;C:\\upp\\bin/pgsql/x86/include;C:\\upp\\bin/mysql/include;C:\\upp\\bin/llvm"
+set LIB=c:/program files/microsoft visual studio/2022/community/vc/tools/msvc/14.44.35207/lib/x86;c:/program files (x86)/windows kits/10/lib/10.0.26100.0/ucrt/x86;c:/program files (x86)/windows kits/10/lib/10.0.26100.0/um/x86;C:\\upp\\bin/openssl/lib32;C:\\upp\\bin/SDL2/lib/x86;C:\\upp\\bin/pgsql/x86/lib;C:\\upp\\bin/mysql/lib32;C:\\upp\\bin/llvm
diff --git a/uppbox/Scripts/vc64.bat b/uppbox/Scripts/vc64.bat
index 76115196c..a34431a13 100644
--- a/uppbox/Scripts/vc64.bat
+++ b/uppbox/Scripts/vc64.bat
@@ -1,3 +1,3 @@
-set PATH=c:/upp/nasm;c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/bin/hostx64/x64;c:/program files (x86)/windows kits/10/bin/10.0.18362.0/x64;C:\\upp\\bin/openssl/bin64;C:\\upp\\bin/SDL2/lib/x64;C:\\upp\\bin/pgsql/x64/bin;C:\\upp\\bin/mysql/lib64;%PATH%
-set INCLUDE=c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/include;c:/program files (x86)/windows kits/10/include/10.0.18362.0/um;c:/program files (x86)/windows kits/10/include/10.0.18362.0/ucrt;c:/program files (x86)/windows kits/10/include/10.0.18362.0/shared
-set LIB=c:/program files (x86)/microsoft visual studio/2019/buildtools/vc/tools/msvc/14.23.28105/lib/x64;c:/program files (x86)/windows kits/10/lib/10.0.18362.0/ucrt/x64;c:/program files (x86)/windows kits/10/lib/10.0.18362.0/um/x64
+set PATH=%PATH%;c:/program files/microsoft visual studio/2022/community/vc/tools/msvc/14.44.35207/bin/hostx64/x64;c:/program files (x86)/windows kits/10/bin/10.0.26100.0/x64;C:\\upp\\bin/SDL2/lib/x64;C:\\upp\\bin/pgsql/x64/bin;C:\\upp\\bin/mysql/lib64
+set INCLUDE=c:/program files/microsoft visual studio/2022/community/vc/tools/msvc/14.44.35207/include;c:/program files (x86)/windows kits/10/include/10.0.26100.0/um;c:/program files (x86)/windows kits/10/include/10.0.26100.0/ucrt;c:/program files (x86)/windows kits/10/include/10.0.26100.0/shared;C:\\upp\\bin/openssl/include;C:\\upp\\bin/SDL2/include;C:\\upp\\bin/pgsql/x64/include;C:\\upp\\bin/mysql/include;C:\\upp\\bin/llvm
+set LIB=c:/program files/microsoft visual studio/2022/community/vc/tools/msvc/14.44.35207/lib/x64;c:/program files (x86)/windows kits/10/lib/10.0.26100.0/ucrt/x64;c:/program files (x86)/windows kits/10/lib/10.0.26100.0/um/x64;C:\\upp\\bin/openssl/lib64;C:\\upp\\bin/SDL2/lib/x64;C:\\upp\\bin/pgsql/x64/lib;C:\\upp\\bin/mysql/lib64;C:\\upp\\bin/llvm;C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v12.6\\lib\\x64
diff --git a/uppsrc/Core/Ops.h b/uppsrc/Core/Ops.h
index ffa6dc573..4beb3317a 100644
--- a/uppsrc/Core/Ops.h
+++ b/uppsrc/Core/Ops.h
@@ -284,7 +284,7 @@ int CountTrailingZeroBits64(uint64 x)
 {
 #if COMPILER_GCC && !defined(flagLEGACY_CPU)
 	return __builtin_ctzll(x);
-#elif COMPILER_MSC && !defined(flagLEGACY_CPU)
+#elif COMPILER_MSC && !defined(flagLEGACY_CPU) && CPU_64
 	unsigned long index;
 	_BitScanForward64(&index, x);
 	return index;
diff --git a/uppsrc/CtrlLib/Text.cpp b/uppsrc/CtrlLib/Text.cpp
index f55bf296e..4082f6a1b 100644
--- a/uppsrc/CtrlLib/Text.cpp
+++ b/uppsrc/CtrlLib/Text.cpp
@@ -36,7 +36,7 @@ TextCtrl::TextCtrl()
 	max_total = 200 * 1024 * 1024;
 #endif
 #endif
-	max_line_len = 100000;
+	max_line_len = 400000;
 	truncated = false;
 }
 
@@ -188,6 +188,7 @@ int TextCtrl::LoadLines(Vector<Ln>& ls, int n, int64& total, Stream& in, byte ch
 	bool cr = false;
 	byte b8 = 0;
 	auto line_count = [&] { return view_line_count ? *view_line_count : ls.GetCount(); };
+	int max_line_len16 = max_line_len / 4;
 	if(charset == CHARSET_UTF16_LE || charset == CHARSET_UTF16_BE) {
 		WStringBuffer wln;
 		auto put_wln = [&]() {
@@ -219,7 +220,7 @@ int TextCtrl::LoadLines(Vector<Ln>& ls, int n, int64& total, Stream& in, byte ch
 			}
 			else {
 				wln.Cat(c);
-				if(wln.GetCount() >= max_line_len)
+				if(wln.GetCount() >= max_line_len16)
 					goto truncate_line;
 			}
 		}