diff --git a/_Make_all.bat b/_Make_all.bat
index 4c47a8508..599872aa1 100644
--- a/_Make_all.bat
+++ b/_Make_all.bat
@@ -22,7 +22,7 @@ del /q objs\*.o>nul
 rd objs>nul
 
 cls
-title [1/10] Building webftp_server_full.sprx...
+title [1/4] Building webftp_server_full.sprx...
 copy .\flags\flags_full.h .\flags.h >nul
 %CYGWIN%\bash --login -i -c 'make' >nul
 if exist webftp_server.sprx ren webftp_server.sprx webftp_server_full.sprx
@@ -39,63 +39,7 @@ del /q objs\*.o>nul
 rd objs>nul
 
 cls
-title [2/10] Building webftp_server_cobra.sprx...
-copy .\flags\flags_cobra.h .\flags.h >nul
-%CYGWIN%\bash --login -i -c 'make' >nul
-if exist webftp_server.sprx ren webftp_server.sprx webftp_server_cobra.sprx
-
-del /q webftp_server.elf>nul
-del /q webftp_server.prx>nul
-del /q webftp_server.sym>nul
-
-del /q objs\*.d>nul
-del /q objs\*.o>nul
-rd objs>nul
-
-cls
-title [3/10] Building webftp_server_ps3mapi.sprx...
-copy .\flags\flags_ps3mapi.h .\flags.h >nul
-%CYGWIN%\bash --login -i -c 'make' >nul
-if exist webftp_server.sprx ren webftp_server.sprx webftp_server_ps3mapi.sprx
-
-del /q webftp_server.elf>nul
-del /q webftp_server.prx>nul
-del /q webftp_server.sym>nul
-
-del /q objs\*.d>nul
-del /q objs\*.o>nul
-rd objs>nul
-
-cls
-title [4/10] Building webftp_server_english.sprx...
-copy .\flags\flags_english.h .\flags.h >nul
-%CYGWIN%\bash --login -i -c 'make' >nul
-if exist webftp_server.sprx ren webftp_server.sprx webftp_server_english.sprx
-
-del /q webftp_server.elf>nul
-del /q webftp_server.prx>nul
-del /q webftp_server.sym>nul
-
-del /q objs\*.d>nul
-del /q objs\*.o>nul
-rd objs>nul
-
-cls
-title [5/10] Building webftp_server_rebug_cobra_multi23.sprx...
-copy .\flags\flags_rebug_cobra_multi23.h .\flags.h >nul
-%CYGWIN%\bash --login -i -c 'make' >nul
-if exist webftp_server.sprx ren webftp_server.sprx webftp_server_rebug_cobra_multi23.sprx
-
-del /q webftp_server.elf>nul
-del /q webftp_server.prx>nul
-del /q webftp_server.sym>nul
-
-del /q objs\*.d>nul
-del /q objs\*.o>nul
-rd objs>nul
-
-cls
-title [6/10] Building webftp_server_rebug_cobra_ps3mapi.sprx...
+title [2/4] Building webftp_server_rebug_cobra_ps3mapi.sprx...
 copy .\flags\flags_rebug_cobra_ps3mapi.h .\flags.h >nul
 %CYGWIN%\bash --login -i -c 'make' >nul
 if exist webftp_server.sprx ren webftp_server.sprx webftp_server_rebug_cobra_ps3mapi.sprx
@@ -108,20 +52,7 @@ del /q objs\*.d>nul
 del /q objs\*.o>nul
 
 cls
-title [7/10] Building webftp_server_rebug_cobra_english.sprx...
-copy .\flags\flags_rebug_cobra_english.h .\flags.h >nul
-%CYGWIN%\bash --login -i -c 'make' >nul
-if exist webftp_server.sprx ren webftp_server.sprx webftp_server_rebug_cobra_english.sprx
-
-del /q webftp_server.elf>nul
-del /q webftp_server.prx>nul
-del /q webftp_server.sym>nul
-
-del /q objs\*.d>nul
-del /q objs\*.o>nul
-
-cls
-title [8/10] Building webftp_server_noncobra.sprx...
+title [3/4] Building webftp_server_noncobra.sprx...
 copy .\flags\flags_noncobra.h .\flags.h >nul
 %CYGWIN%\bash --login -i -c 'make' >nul
 if exist webftp_server.sprx ren webftp_server.sprx webftp_server_noncobra.sprx
@@ -134,20 +65,7 @@ del /q objs\*.d>nul
 del /q objs\*.o>nul
 
 cls
-title [9/10] Building webftp_server_ccapi.sprx...
-copy .\flags\flags_ccapi.h .\flags.h >nul
-%CYGWIN%\bash --login -i -c 'make' >nul
-if exist webftp_server.sprx ren webftp_server.sprx webftp_server_ccapi.sprx
-
-del /q webftp_server.elf>nul
-del /q webftp_server.prx>nul
-del /q webftp_server.sym>nul
-
-del /q objs\*.d>nul
-del /q objs\*.o>nul
-
-cls
-title [10/10] Building webftp_server_lite.sprx...
+title [4/4] Building webftp_server_lite.sprx...
 copy .\flags\flags_lite.h .\flags.h >nul
 %CYGWIN%\bash --login -i -c 'make' >nul
 if exist webftp_server.sprx ren webftp_server.sprx webftp_server_lite.sprx
@@ -171,7 +89,6 @@ del /q objs\*.o>nul
 rd objs>nul
 
 copy .\flags\flags_full.h .\flags.h >nul
-ren webftp_server_cobra.sprx webftp_server.sprx
 
 cls
 dir *.sprx
diff --git a/_Make_all.sh b/_Make_all.sh
index 10b6b81e5..0067e2c2e 100644
--- a/_Make_all.sh
+++ b/_Make_all.sh
@@ -7,54 +7,18 @@ make
 [ -f webftp_server.sprx ] && mv webftp_server.sprx webftp_server_full.sprx || :
 make clean
 clear
-echo -ne "\033]0;[2/10] Building webftp_server_cobra.sprx...\007"
-cp flags/flags_cobra.h flags.h
-make
-[ -f webftp_server.sprx ] && mv webftp_server.sprx webftp_server_cobra.sprx || :
-make clean
-clear
-echo -ne "\033]0;[3/10] Building webftp_server_ps3mapi.sprx...\007"
-cp flags/flags_ps3mapi.h flags.h
-make
-[ -f webftp_server.sprx ] && mv webftp_server.sprx webftp_server_ps3mapi.sprx || :
-make clean
-clear
-echo -ne "\033]0;[4/10] Building webftp_server_english.sprx...\007"
-cp flags/flags_english.h flags.h
-make
-[ -f webftp_server.sprx ] && mv webftp_server.sprx webftp_server_english.sprx || :
-make clean
-clear
-echo -ne "\033]0;[5/10] Building webftp_server_rebug_cobra_multi23.sprx...\007"
-cp flags/flags_rebug_cobra_multi23.h flags.h
-make
-[ -f webftp_server.sprx ] && mv webftp_server.sprx webftp_server_rebug_cobra_multi23.sprx || :
-make clean
-clear
 echo -ne "\033]0;[6/10] Building webftp_server_cobra_ps3mapi.sprx...\007"
 cp flags/flags_rebug_cobra_ps3mapi.h flags.h
 make
 [ -f webftp_server.sprx ] && mv webftp_server.sprx webftp_server_rebug_cobra_ps3mapi.sprx || :
 make clean
 clear
-echo -ne "\033]0;[7/10] Building webftp_server_rebug_cobra_english.sprx...\007"
-cp flags/flags_rebug_cobra_english.h flags.h
-make
-[ -f webftp_server.sprx ] && mv webftp_server.sprx webftp_server_rebug_cobra_english.sprx || :
-make clean
-clear
 echo -ne "\033]0;[8/10] Building webftp_server_noncobra.sprx...\007"
 cp flags/flags_noncobra.h flags.h
 make
 [ -f webftp_server.sprx ] && mv webftp_server.sprx webftp_server_noncobra.sprx || :
 make clean
 clear
-echo -ne "\033]0;[9/10] Building webftp_server_ccapi.sprx...\007"
-cp flags/flags_ccapi.h flags.h
-make
-[ -f webftp_server.sprx ] && mv webftp_server.sprx webftp_server_ccapi.sprx || :
-make clean
-clear
 echo -ne "\033]0;[10/10] Building webftp_server_lite.sprx...\007"
 cp flags/flags_lite.h flags.h
 make
diff --git a/_Make_all_nopause.bat b/_Make_all_nopause.bat
index 3dff7815c..d71ce0307 100644
--- a/_Make_all_nopause.bat
+++ b/_Make_all_nopause.bat
@@ -22,7 +22,7 @@ del /q objs\*.o>nul
 rd objs>nul
 
 cls
-title [1/10] Building webftp_server_full.sprx...
+title [1/4] Building webftp_server_full.sprx...
 copy .\flags\flags_full.h .\flags.h >nul
 %CYGWIN%\bash --login -i -c 'make' >nul
 if exist webftp_server.sprx ren webftp_server.sprx webftp_server_full.sprx
@@ -39,63 +39,7 @@ del /q objs\*.o>nul
 rd objs>nul
 
 cls
-title [2/10] Building webftp_server_cobra.sprx...
-copy .\flags\flags_cobra.h .\flags.h >nul
-%CYGWIN%\bash --login -i -c 'make' >nul
-if exist webftp_server.sprx ren webftp_server.sprx webftp_server_cobra.sprx
-
-del /q webftp_server.elf>nul
-del /q webftp_server.prx>nul
-del /q webftp_server.sym>nul
-
-del /q objs\*.d>nul
-del /q objs\*.o>nul
-rd objs>nul
-
-cls
-title [3/10] Building webftp_server_ps3mapi.sprx...
-copy .\flags\flags_ps3mapi.h .\flags.h >nul
-%CYGWIN%\bash --login -i -c 'make' >nul
-if exist webftp_server.sprx ren webftp_server.sprx webftp_server_ps3mapi.sprx
-
-del /q webftp_server.elf>nul
-del /q webftp_server.prx>nul
-del /q webftp_server.sym>nul
-
-del /q objs\*.d>nul
-del /q objs\*.o>nul
-rd objs>nul
-
-cls
-title [4/10] Building webftp_server_english.sprx...
-copy .\flags\flags_english.h .\flags.h >nul
-%CYGWIN%\bash --login -i -c 'make' >nul
-if exist webftp_server.sprx ren webftp_server.sprx webftp_server_english.sprx
-
-del /q webftp_server.elf>nul
-del /q webftp_server.prx>nul
-del /q webftp_server.sym>nul
-
-del /q objs\*.d>nul
-del /q objs\*.o>nul
-rd objs>nul
-
-cls
-title [5/10] Building webftp_server_rebug_cobra_multi23.sprx...
-copy .\flags\flags_rebug_cobra_multi23.h .\flags.h >nul
-%CYGWIN%\bash --login -i -c 'make' >nul
-if exist webftp_server.sprx ren webftp_server.sprx webftp_server_rebug_cobra_multi23.sprx
-
-del /q webftp_server.elf>nul
-del /q webftp_server.prx>nul
-del /q webftp_server.sym>nul
-
-del /q objs\*.d>nul
-del /q objs\*.o>nul
-rd objs>nul
-
-cls
-title [6/10] Building webftp_server_rebug_cobra_ps3mapi.sprx...
+title [2/4] Building webftp_server_rebug_cobra_ps3mapi.sprx...
 copy .\flags\flags_rebug_cobra_ps3mapi.h .\flags.h >nul
 %CYGWIN%\bash --login -i -c 'make' >nul
 if exist webftp_server.sprx ren webftp_server.sprx webftp_server_rebug_cobra_ps3mapi.sprx
@@ -108,20 +52,7 @@ del /q objs\*.d>nul
 del /q objs\*.o>nul
 
 cls
-title [7/10] Building webftp_server_rebug_cobra_english.sprx...
-copy .\flags\flags_rebug_cobra_english.h .\flags.h >nul
-%CYGWIN%\bash --login -i -c 'make' >nul
-if exist webftp_server.sprx ren webftp_server.sprx webftp_server_rebug_cobra_english.sprx
-
-del /q webftp_server.elf>nul
-del /q webftp_server.prx>nul
-del /q webftp_server.sym>nul
-
-del /q objs\*.d>nul
-del /q objs\*.o>nul
-
-cls
-title [8/10] Building webftp_server_noncobra.sprx...
+title [3/4] Building webftp_server_noncobra.sprx...
 copy .\flags\flags_noncobra.h .\flags.h >nul
 %CYGWIN%\bash --login -i -c 'make' >nul
 if exist webftp_server.sprx ren webftp_server.sprx webftp_server_noncobra.sprx
@@ -134,20 +65,7 @@ del /q objs\*.d>nul
 del /q objs\*.o>nul
 
 cls
-title [9/10] Building webftp_server_ccapi.sprx...
-copy .\flags\flags_ccapi.h .\flags.h >nul
-%CYGWIN%\bash --login -i -c 'make' >nul
-if exist webftp_server.sprx ren webftp_server.sprx webftp_server_ccapi.sprx
-
-del /q webftp_server.elf>nul
-del /q webftp_server.prx>nul
-del /q webftp_server.sym>nul
-
-del /q objs\*.d>nul
-del /q objs\*.o>nul
-
-cls
-title [10/10] Building webftp_server_lite.sprx...
+title [4/4] Building webftp_server_lite.sprx...
 copy .\flags\flags_lite.h .\flags.h >nul
 %CYGWIN%\bash --login -i -c 'make' >nul
 if exist webftp_server.sprx ren webftp_server.sprx webftp_server_lite.sprx
@@ -171,12 +89,11 @@ del /q objs\*.o>nul
 rd objs>nul
 
 copy .\flags\flags_full.h .\flags.h >nul
-ren webftp_server_cobra.sprx webftp_server.sprx
 
 cls
 dir *.sprx
 
-echo press any key to copy and build pkg
+:echo press any key to copy and build pkg
 :pause>nul
 
 _Make_pkg.bat
diff --git a/_Projects_/slaunch/slaunch.c b/_Projects_/slaunch/slaunch.c
index afb6ab5d8..50d2dbd1e 100644
--- a/_Projects_/slaunch/slaunch.c
+++ b/_Projects_/slaunch/slaunch.c
@@ -476,7 +476,7 @@ static void save_config(void)
 
 	if(cellFsOpen(WMTMP "/slaunch.cfg", CELL_FS_O_CREAT | CELL_FS_O_TRUNC | CELL_FS_O_WRONLY, &fd, NULL, 0) == CELL_FS_SUCCEEDED)
 	{
-		cellFsWrite(fd, (void *)&sconfig, sizeof(_sconfig), 0);
+		cellFsWrite(fd, (void *)&sconfig, sizeof(_sconfig), NULL);
 		cellFsClose(fd);
 	}
 }
diff --git a/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server.sprx b/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server.sprx
deleted file mode 100644
index 485b47101..000000000
Binary files a/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server.sprx and /dev/null differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server_ccapi.sprx b/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server_ccapi.sprx
deleted file mode 100644
index ab6b4324d..000000000
Binary files a/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server_ccapi.sprx and /dev/null differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server_lite.sprx b/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server_lite.sprx
deleted file mode 100644
index cb48cad56..000000000
Binary files a/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server_lite.sprx and /dev/null differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server_noncobra.sprx b/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server_noncobra.sprx
deleted file mode 100644
index e1b5b4c0e..000000000
Binary files a/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server_noncobra.sprx and /dev/null differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server_ntfs.sprx b/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server_ntfs.sprx
deleted file mode 100644
index fbab96f09..000000000
Binary files a/_Projects_/updater/pkgfiles/USRDIR/official/webftp_server_ntfs.sprx and /dev/null differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server.sprx
deleted file mode 100644
index 7eada34cd..000000000
Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server.sprx and /dev/null differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_ccapi.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_ccapi.sprx
deleted file mode 100644
index acbdbe17f..000000000
Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_ccapi.sprx and /dev/null differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_english.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_english.sprx
deleted file mode 100644
index d569f4750..000000000
Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_english.sprx and /dev/null differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx
index 6a8a4871a..fac6cc6fb 100644
Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx and b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_full.sprx differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx
index 0967f7e06..5ca7e6300 100644
Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx and b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_lite.sprx differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx
index f501503be..5924bb4cb 100644
Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx and b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_noncobra.sprx differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_ps3mapi.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_ps3mapi.sprx
deleted file mode 100644
index 667f47a95..000000000
Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_ps3mapi.sprx and /dev/null differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_english.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_english.sprx
deleted file mode 100644
index 14f8f2b26..000000000
Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_english.sprx and /dev/null differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_multi23.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_multi23.sprx
deleted file mode 100644
index 502f50270..000000000
Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_multi23.sprx and /dev/null differ
diff --git a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx
index 57bfa8f42..3b22e2c14 100644
Binary files a/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx and b/_Projects_/updater/pkgfiles/USRDIR/webftp_server_rebug_cobra_ps3mapi.sprx differ
diff --git a/_Projects_/updater/source/main.c b/_Projects_/updater/source/main.c
index 6e01a0097..509dd4df6 100644
--- a/_Projects_/updater/source/main.c
+++ b/_Projects_/updater/source/main.c
@@ -569,6 +569,13 @@ int main()
 	sysLv2FsUnlink(TMP_DIR "/idle_plugin.sprx");
 	CopyFile(APP_USRDIR "/wm_proxy.sprx", TMP_DIR "/eula_cddb_plugin.sprx");
 
+	sysLv2FsUnlink(APP_USRDIR "webftp_server.sprx");
+	sysLv2FsUnlink(APP_USRDIR "webftp_server_ps3mapi.sprx");
+	sysLv2FsUnlink(APP_USRDIR "webftp_server_english.sprx");
+	sysLv2FsUnlink(APP_USRDIR "webftp_server_ccapi.sprx");
+	sysLv2FsUnlink(APP_USRDIR "webftp_server_rebug_cobra_multi23.sprx");
+	sysLv2FsUnlink(APP_USRDIR "webftp_server_rebug_cobra_english.sprx");
+
 	sysLv2FsMkdir(PLUGINS_DIR, 0777);
 
 	// install vsh menu
@@ -704,33 +711,20 @@ int main()
 		CopyFile(APP_USRDIR "/video_rec.sprx", PLUGINS_DIR "/video_rec.sprx");
 
 	// update PRX+Mamba Loader
-	if((sysLv2FsStat(IRISMAN_USRDIR "/webftp_server.sprx", &stat) == SUCCESS))
+	if((sysLv2FsStat(IRISMAN_USRDIR "/webftp_server.sprx", &stat) == SUCCESS) || (sysLv2FsStat(IRISMAN_USRDIR "/webftp_server_ps3mapi.sprx", &stat) == SUCCESS))
 	{
 		sysLv2FsChmod(IRISMAN_USRDIR "/webftp_server.sprx", 0777);
 		sysLv2FsUnlink(IRISMAN_USRDIR "/webftp_server.sprx");
 
+		sysLv2FsChmod(IRISMAN_USRDIR "/webftp_server_ps3mapi.sprx", 0777);
+		sysLv2FsUnlink(IRISMAN_USRDIR "/webftp_server_ps3mapi.sprx");
+
 		if(full)
 			CopyFile(APP_USRDIR "/webftp_server_full.sprx", IRISMAN_USRDIR "/webftp_server.sprx");
-		else if((sysLv2FsStat(REBUG_DIR, &stat) == SUCCESS) && is_ps3mapi())
-			CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", IRISMAN_USRDIR "/webftp_server.sprx");
-		else if((sysLv2FsStat(REBUG_DIR, &stat) == SUCCESS))
-			CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_multi23.sprx", IRISMAN_USRDIR "/webftp_server.sprx");
 		else if(lite)
 			CopyFile(APP_USRDIR "/webftp_server_lite.sprx", IRISMAN_USRDIR "/webftp_server.sprx");
-		else if(is_ps3mapi())
-			CopyFile(APP_USRDIR "/webftp_server_ps3mapi.sprx", IRISMAN_USRDIR "/webftp_server.sprx");
-		else
-			CopyFile(APP_USRDIR "/webftp_server.sprx", IRISMAN_USRDIR "/webftp_server.sprx");
-	}
-	else if((sysLv2FsStat(IRISMAN_USRDIR "/webftp_server_ps3mapi.sprx", &stat) == SUCCESS))
-	{
-		sysLv2FsChmod(IRISMAN_USRDIR "/webftp_server_ps3mapi.sprx", 0777);
-		sysLv2FsUnlink(IRISMAN_USRDIR "/webftp_server_ps3mapi.sprx");
-
-		if((sysLv2FsStat(REBUG_DIR, &stat) == SUCCESS))
-			CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", IRISMAN_USRDIR "/webftp_server_ps3mapi.sprx");
 		else
-			CopyFile(APP_USRDIR "/webftp_server_ps3mapi.sprx", IRISMAN_USRDIR "/webftp_server_ps3mapi.sprx");
+			CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", IRISMAN_USRDIR "/webftp_server.sprx");
 	}
 
 	char line[255];
@@ -781,10 +775,8 @@ int main()
 			CopyFile(APP_USRDIR "/webftp_server_full.sprx", REBUG_VSH_MODULE_DIR "/webftp_server.sprx");
 		else if(lite)
 			CopyFile(APP_USRDIR "/webftp_server_lite.sprx", REBUG_VSH_MODULE_DIR "/webftp_server.sprx");
-		else if(is_ps3mapi())
-			CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", REBUG_VSH_MODULE_DIR "/webftp_server.sprx");
 		else
-			CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_multi23.sprx", REBUG_VSH_MODULE_DIR "/webftp_server.sprx");
+			CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", REBUG_VSH_MODULE_DIR "/webftp_server.sprx");
 
 
 		// delete webMAN from hdd0
@@ -834,10 +826,8 @@ int main()
 			CopyFile(APP_USRDIR "/webftp_server_full.sprx", REBUG_VSH_MODULE_DIR "/webftp_server.sprx.bak");
 		else if(lite)
 			CopyFile(APP_USRDIR "/webftp_server_lite.sprx", REBUG_VSH_MODULE_DIR "/webftp_server.sprx.bak");
-		else if(is_ps3mapi())
-			CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", REBUG_VSH_MODULE_DIR "/webftp_server.sprx.bak");
 		else
-			CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_multi23.sprx", REBUG_VSH_MODULE_DIR "/webftp_server.sprx.bak");
+			CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", REBUG_VSH_MODULE_DIR "/webftp_server.sprx.bak");
 	}
 
 	// update boot_plugins.txt
@@ -860,12 +850,7 @@ int main()
 					else if(lite)
 						CopyFile(APP_USRDIR "/webftp_server_lite.sprx", line);
 					else
-					{
-						if(is_ps3mapi())
-							CopyFile(APP_USRDIR "/webftp_server_ps3mapi.sprx", line);
-						else
-							CopyFile(APP_USRDIR "/webftp_server.sprx", line);
-					}
+						CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", line);
 					goto exit;
 				}
 			}
@@ -879,17 +864,11 @@ int main()
 			f = fopen(HDDROOT_DIR "/boot_plugins.txt", "w");
 		if((sysLv2FsStat(PLUGINS_DIR, &stat) == SUCCESS))
 		{
-			if(is_ps3mapi() && !lite && !full)
-				fputs("\r\n" PLUGINS_DIR "/webftp_server_ps3mapi.sprx", f);
-			else
-				fputs("\r\n" PLUGINS_DIR "/webftp_server.sprx", f);
+			fputs("\r\n" PLUGINS_DIR "/webftp_server.sprx", f);
 		}
 		else
 		{
-			if(is_ps3mapi() && !lite && !full)
-				fputs("\r\n" HDDROOT_DIR "/webftp_server_ps3mapi.sprx", f);
-			else
-				fputs("\r\n" HDDROOT_DIR "/webftp_server.sprx", f);
+			fputs("\r\n" HDDROOT_DIR "/webftp_server.sprx", f);
 		}
 		fclose(f);
 
@@ -914,17 +893,7 @@ int main()
 			else if(lite)
 				CopyFile(APP_USRDIR "/webftp_server_lite.sprx", PLUGINS_DIR "/webftp_server.sprx");
 			else
-			{
-				if(is_ps3mapi())
-				{
-					if((sysLv2FsStat(REBUG_DIR, &stat) == SUCCESS))
-						CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", PLUGINS_DIR "/webftp_server_ps3mapi.sprx");
-					else
-						CopyFile(APP_USRDIR "/webftp_server_ps3mapi.sprx", PLUGINS_DIR "/webftp_server_ps3mapi.sprx");
-				}
-				else
-					CopyFile(APP_USRDIR "/webftp_server.sprx", PLUGINS_DIR "/webftp_server.sprx");
-			}
+				CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", PLUGINS_DIR "/webftp_server.sprx");
 		}
 		else
 		{
@@ -933,17 +902,7 @@ int main()
 			else if(lite)
 				CopyFile(APP_USRDIR "/webftp_server_lite.sprx", HDDROOT_DIR "/webftp_server.sprx");
 			else
-			{
-				if(is_ps3mapi())
-				{
-					if((sysLv2FsStat(REBUG_DIR, &stat) == SUCCESS))
-						CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", HDDROOT_DIR "/webftp_server_ps3mapi.sprx");
-					else
-						CopyFile(APP_USRDIR "/webftp_server_ps3mapi.sprx", HDDROOT_DIR "/webftp_server_ps3mapi.sprx");
-				}
-				else
-					CopyFile(APP_USRDIR "/webftp_server.sprx", HDDROOT_DIR "/webftp_server.sprx");
-			}
+				CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", HDDROOT_DIR "/webftp_server.sprx");
 		}
 	}
 
@@ -968,7 +927,7 @@ int main()
 					else if(lite)
 						CopyFile(APP_USRDIR "/webftp_server_lite.sprx", line);
 					else
-						CopyFile(APP_USRDIR "/webftp_server_ps3mapi.sprx", line);
+						CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", line);
 					goto exit;
 				}
 			}
@@ -982,15 +941,10 @@ int main()
 			f = fopen(HDDROOT_DIR "/mamba_plugins.txt", "w");
 		if((sysLv2FsStat(PLUGINS_DIR, &stat) == SUCCESS))
 		{
-			if(full || lite)
-				fputs("\r\n" PLUGINS_DIR "/webftp_server.sprx", f);
-			else
-				fputs("\r\n" PLUGINS_DIR "/webftp_server_ps3mapi.sprx", f);
+			fputs("\r\n" PLUGINS_DIR "/webftp_server.sprx", f);
 		}
-		else if(full || lite)
-			fputs("\r\n" HDDROOT_DIR "/webftp_server.sprx", f);
 		else
-			fputs("\r\n" HDDROOT_DIR "/webftp_server_ps3mapi.sprx", f);
+			fputs("\r\n" HDDROOT_DIR "/webftp_server.sprx", f);
 		fclose(f);
 
 		// delete old sprx
@@ -1007,10 +961,8 @@ int main()
 				CopyFile(APP_USRDIR "/webftp_server_full.sprx", PLUGINS_DIR "/webftp_server.sprx");
 			else if(lite)
 				CopyFile(APP_USRDIR "/webftp_server_lite.sprx", PLUGINS_DIR "/webftp_server.sprx");
-			else if((sysLv2FsStat(REBUG_DIR, &stat) == SUCCESS))
-				CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", PLUGINS_DIR "/webftp_server_ps3mapi.sprx");
 			else
-				CopyFile(APP_USRDIR "/webftp_server_ps3mapi.sprx", PLUGINS_DIR "/webftp_server_ps3mapi.sprx");
+				CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", PLUGINS_DIR "/webftp_server.sprx");
 		}
 		else
 		{
@@ -1018,10 +970,8 @@ int main()
 				CopyFile(APP_USRDIR "/webftp_server_full.sprx", HDDROOT_DIR "/webftp_server.sprx");
 			else if(lite)
 				CopyFile(APP_USRDIR "/webftp_server_lite.sprx", HDDROOT_DIR "/webftp_server.sprx");
-			else if((sysLv2FsStat(REBUG_DIR, &stat) == SUCCESS))
-				CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", HDDROOT_DIR "/webftp_server_ps3mapi.sprx");
 			else
-				CopyFile(APP_USRDIR "/webftp_server_ps3mapi.sprx", HDDROOT_DIR "/webftp_server_ps3mapi.sprx");
+				CopyFile(APP_USRDIR "/webftp_server_rebug_cobra_ps3mapi.sprx", HDDROOT_DIR "/webftp_server.sprx");
 		}
 	}
 
diff --git a/flags.h b/flags.h
index 2bb0046a5..d6c6fe62f 100644
--- a/flags.h
+++ b/flags.h
@@ -7,7 +7,6 @@
 #define REX_ONLY		1	// shortcuts for REBUG REX CFWs / comment out for usual CFW
 
 #define PS3MAPI			1	// ps3 manager API & webGUI by _NzV_
-//#define CCAPI			1	// uncomment for ccapi release
 //#define LITE_EDITION	1	// no ps3netsrv support, smaller memory footprint
 
 #define DEX_SUPPORT		1	// add support for DEX
diff --git a/flags/flags_ccapi.h b/flags/flags_ccapi.h
deleted file mode 100644
index 057647aad..000000000
--- a/flags/flags_ccapi.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//#define ENGLISH_ONLY	1	// uncomment for english only version
-#define WM_PROXY_SPRX	"eula_cddb_plugin"		// plugin used as xmb proxy to mount games
-
-//// EDITIONS ////
-
-//#define COBRA_ONLY	1	// comment out for ccapi/non-cobra release
-//#define REX_ONLY		1	// shortcuts for REBUG REX CFWs / comment out for usual CFW
-
-//#define PS3MAPI		1	// ps3 manager API & webGUI by _NzV_
-#define CCAPI			1	// uncomment for ccapi release
-//#define LITE_EDITION	1	// no ps3netsrv support, smaller memory footprint
-
-#define DEX_SUPPORT		1	// add support for DEX
-//#define DECR_SUPPORT	1	// add support for DECR
-//#define LAST_FIRMWARE_ONLY 1	//  support only 4.80-4.81 CEX / DEX (no DECR support)
-
-//// FEATURES ////
-#define FIX_GAME		1	// Auto-Fix game
-#define EXT_GDATA		1	// /extgd.ps3?status /extgd.ps3?enable /extgd.ps3?disable (external gameDATA)
-#define COPY_PS3		1	// /copy.ps3/<path>
-#define DEBUG_MEM		1	// /dump.ps3 / peek.lv1 / poke.lv1 / find.lv1 / peek.lv2 / poke.lv2 / find.lv2
-#define VIDEO_REC		1	// /videorec.ps3  start/stop video recording (in-game only) (thanks to mysis & 3141card)
-#define LOAD_PRX		1	// /loadprx.ps3?slot=n&prx=path/file.sprx  (load prx)
-//#define FAKEISO 		1	// support .ntfs[BDFILE] (fake ISO)
-#define BDVD_REGION		1	// change BD/DVD region
-#define REMOVE_SYSCALLS	1	// remove syscalls on startup and using R2+TRIANGLE
-#define SPOOF_CONSOLEID	1	// spoof idps/psid (thanks to M@tumot0 & zar)
-#define VIRTUAL_PAD		1	// virtual pad (thanks to OsiriX)
-#define WM_REQUEST		1	// accept commands via local file /dev_hdd0/tmp/wm_request
-#define GET_KLICENSEE	1	// /klic.ps3
-#define PS3_BROWSER		1	// /browser.ps3 / open browser combos
-//#define EMBED_JS		1	// use embedded javascript instead of external js files
-#define AUTO_POWER_OFF	1	// Disable temporarily the auto power off setting in xRegistry during ftp session, /install.ps3 & /download.ps3 (idea by 444nonymous)
-//#define OFFLINE_INGAME	1	// allow set auto-disable network in-game (idea by 444nonymous)
-#define SYS_ADMIN_MODE	1	// Enable restricted / admin modes using L2+R2+TRIANGLE
-//#define PKG_LAUNCHER	1	// scan & mount np games extracted to GAMEI / scan ROMS
-#define PKG_HANDLER		1	// /download.ps3?url=<url>, /download.ps3?to=<path>&url=<url>, /install.ps3<pkg-path> (thanks to bguerville & mysis)
-//#define USE_NTFS		1	// add NTFS support
-
-//// EXTRA FEATURES ////
-//#define XMB_SCREENSHOT	1	// screenshot XMB using L2 + R2 + SELECT + START (thanks to 3141card)
-//#define SWAP_KERNEL		1	// load custom lv2_kernel.self patching LV1 and soft rebooting (use /copy.ps3) [requires QA flag enabled]
-//#define WM_CUSTOM_COMBO	"/dev_hdd0/tmp/wm_combo/wm_custom_"		// advanced custom combos
-//#define NET3NET4			1	// add support for /net3 and /net4
-//#define PS3NET_SERVER		1	// ps3 net server
-//#define PS2_DISC			1	// uncomment to support /mount.ps2 (mount ps2 game folder as /dev_ps2disc) requires a physical PS2 disc to swap discs (thanks to WuEpE)
-//#define NOSINGSTAR		1	// remove SingStar icon from XMB  (thanks to bguerville)
-//#define CALC_MD5			1	// /md5.ps3/<file>
-//#define LAUNCHPAD			1	// create /dev_hdd0/tmp/wm_lauchpad.xml
-
-//// TEST FEATURES ////
-//#define SYS_BGM			1	// system background music (may freeze the system when enabled)
-//#define USE_DEBUG			1	// debug using telnet
-//#define WEB_CHAT			1	// /chat.ps3
-//#define AUTO_EJECT_DISC	1	// eject disc holding SELECT on mount
-//#define RAWISO_PSX_MULTI		// support for multi PSX from Iris Manager (it's incomplete - only rawseciso.h code is complete) (thanks to Estwald)
-//#define DO_WM_REQUEST_POLLING	// poll file /dev_hdd0/tmp/wm_request (can be used by external apps)
-//#define SECURE_FILE_ID	// hook savedata plugin to capture secure file id (this feature is currently broken)
-
-
diff --git a/flags/flags_full.h b/flags/flags_full.h
index 2bb0046a5..d6c6fe62f 100644
--- a/flags/flags_full.h
+++ b/flags/flags_full.h
@@ -7,7 +7,6 @@
 #define REX_ONLY		1	// shortcuts for REBUG REX CFWs / comment out for usual CFW
 
 #define PS3MAPI			1	// ps3 manager API & webGUI by _NzV_
-//#define CCAPI			1	// uncomment for ccapi release
 //#define LITE_EDITION	1	// no ps3netsrv support, smaller memory footprint
 
 #define DEX_SUPPORT		1	// add support for DEX
diff --git a/flags/flags_lite.h b/flags/flags_lite.h
index 9570be48d..bc5794ba4 100644
--- a/flags/flags_lite.h
+++ b/flags/flags_lite.h
@@ -7,12 +7,11 @@
 //#define REX_ONLY		1	// shortcuts for REBUG REX CFWs / comment out for usual CFW
 
 //#define PS3MAPI		1	// ps3 manager API & webGUI by _NzV_
-//#define CCAPI			1	// uncomment for ccapi release
 #define LITE_EDITION	1	// no ps3netsrv support, smaller memory footprint
 
 #define DEX_SUPPORT		1	// add support for DEX
 //#define DECR_SUPPORT	1	// add support for DECR
-//#define LAST_FIRMWARE_ONLY 1	//  support only 4.80-4.81 CEX / DEX (no DECR support)
+#define LAST_FIRMWARE_ONLY 1	//  support only 4.80-4.81 CEX / DEX (no DECR support)
 
 //// FEATURES ////
 //#define FIX_GAME		1	// Auto-Fix game
diff --git a/flags/flags_noncobra.h b/flags/flags_noncobra.h
index a645a95a1..a4743dcf5 100644
--- a/flags/flags_noncobra.h
+++ b/flags/flags_noncobra.h
@@ -7,7 +7,6 @@
 //#define REX_ONLY		1	// shortcuts for REBUG REX CFWs / comment out for usual CFW
 
 //#define PS3MAPI		1	// ps3 manager API & webGUI by _NzV_
-//#define CCAPI			1	// uncomment for ccapi release
 //#define LITE_EDITION	1	// no ps3netsrv support, smaller memory footprint
 
 #define DEX_SUPPORT		1	// add support for DEX
diff --git a/flags/flags_rebug_cobra_ps3mapi.h b/flags/flags_rebug_cobra_ps3mapi.h
index 6384662eb..13ff5c7af 100644
--- a/flags/flags_rebug_cobra_ps3mapi.h
+++ b/flags/flags_rebug_cobra_ps3mapi.h
@@ -7,7 +7,6 @@
 #define REX_ONLY		1	// shortcuts for REBUG REX CFWs / comment out for usual CFW
 
 #define PS3MAPI			1	// ps3 manager API & webGUI by _NzV_
-//#define CCAPI			1	// uncomment for ccapi release
 //#define LITE_EDITION	1	// no ps3netsrv support, smaller memory footprint
 
 #define DEX_SUPPORT		1	// add support for DEX
diff --git a/flags/flags_cobra.h b/flags/other/flags_cobra.h
similarity index 98%
rename from flags/flags_cobra.h
rename to flags/other/flags_cobra.h
index ffb0ceb56..63324528d 100644
--- a/flags/flags_cobra.h
+++ b/flags/other/flags_cobra.h
@@ -7,7 +7,6 @@
 //#define REX_ONLY		1	// shortcuts for REBUG REX CFWs / comment out for usual CFW
 
 //#define PS3MAPI		1	// ps3 manager API & webGUI by _NzV_
-//#define CCAPI			1	// uncomment for ccapi release
 //#define LITE_EDITION	1	// no ps3netsrv support, smaller memory footprint
 
 #define DEX_SUPPORT		1	// add support for DEX
diff --git a/flags/flags_english.h b/flags/other/flags_english.h
similarity index 98%
rename from flags/flags_english.h
rename to flags/other/flags_english.h
index 9f0b79a0f..e74deebda 100644
--- a/flags/flags_english.h
+++ b/flags/other/flags_english.h
@@ -7,7 +7,6 @@
 //#define REX_ONLY		1	// shortcuts for REBUG REX CFWs / comment out for usual CFW
 
 //#define PS3MAPI		1	// ps3 manager API & webGUI by _NzV_
-//#define CCAPI			1	// uncomment for ccapi release
 //#define LITE_EDITION	1	// no ps3netsrv support, smaller memory footprint
 
 #define DEX_SUPPORT		1	// add support for DEX
diff --git a/flags/flags_ps3mapi.h b/flags/other/flags_ps3mapi.h
similarity index 98%
rename from flags/flags_ps3mapi.h
rename to flags/other/flags_ps3mapi.h
index c32ea41bf..0f2fd59cf 100644
--- a/flags/flags_ps3mapi.h
+++ b/flags/other/flags_ps3mapi.h
@@ -7,7 +7,6 @@
 //#define REX_ONLY		1	// shortcuts for REBUG REX CFWs / comment out for usual CFW
 
 #define PS3MAPI			1	// ps3 manager API & webGUI by _NzV_
-//#define CCAPI			1	// uncomment for ccapi release
 //#define LITE_EDITION	1	// no ps3netsrv support, smaller memory footprint
 
 #define DEX_SUPPORT		1	// add support for DEX
diff --git a/flags/flags_rebug_cfw.h b/flags/other/flags_rebug_cfw.h
similarity index 98%
rename from flags/flags_rebug_cfw.h
rename to flags/other/flags_rebug_cfw.h
index 03160194f..1a58712ae 100644
--- a/flags/flags_rebug_cfw.h
+++ b/flags/other/flags_rebug_cfw.h
@@ -7,7 +7,6 @@
 #define REX_ONLY		1	// shortcuts for REBUG REX CFWs / comment out for usual CFW
 
 #define PS3MAPI			1	// ps3 manager API & webGUI by _NzV_
-//#define CCAPI			1	// uncomment for ccapi release
 //#define LITE_EDITION	1	// no ps3netsrv support, smaller memory footprint
 
 #define DEX_SUPPORT		1	// add support for DEX
diff --git a/flags/flags_rebug_cobra_english.h b/flags/other/flags_rebug_cobra_english.h
similarity index 98%
rename from flags/flags_rebug_cobra_english.h
rename to flags/other/flags_rebug_cobra_english.h
index 099ba63b3..90dbd5487 100644
--- a/flags/flags_rebug_cobra_english.h
+++ b/flags/other/flags_rebug_cobra_english.h
@@ -7,7 +7,6 @@
 #define REX_ONLY		1	// shortcuts for REBUG REX CFWs / comment out for usual CFW
 
 //#define PS3MAPI		1	// ps3 manager API & webGUI by _NzV_
-//#define CCAPI			1	// uncomment for ccapi release
 //#define LITE_EDITION	1	// no ps3netsrv support, smaller memory footprint
 
 #define DEX_SUPPORT		1	// add support for DEX
diff --git a/flags/flags_rebug_cobra_multi23.h b/flags/other/flags_rebug_cobra_multi23.h
similarity index 98%
rename from flags/flags_rebug_cobra_multi23.h
rename to flags/other/flags_rebug_cobra_multi23.h
index b7060faad..1c69bbecf 100644
--- a/flags/flags_rebug_cobra_multi23.h
+++ b/flags/other/flags_rebug_cobra_multi23.h
@@ -7,7 +7,6 @@
 #define REX_ONLY		1	// shortcuts for REBUG REX CFWs / comment out for usual CFW
 
 //#define PS3MAPI		1	// ps3 manager API & webGUI by _NzV_
-//#define CCAPI			1	// uncomment for ccapi release
 //#define LITE_EDITION	1	// no ps3netsrv support, smaller memory footprint
 
 #define DEX_SUPPORT		1	// add support for DEX
diff --git a/include/_mount.h b/include/_mount.h
index 9a010c745..116514221 100644
--- a/include/_mount.h
+++ b/include/_mount.h
@@ -993,8 +993,8 @@ static void mount_autoboot(void)
 	if(do_mount)
 	{   // add some delay
 		if(webman_config->delay)      {sys_ppu_thread_sleep(5); wait_for(path, 2 * (webman_config->boots + webman_config->bootd));}
-		else if(islike(path, "/net"))  sys_ppu_thread_sleep(5);
 #ifndef COBRA_ONLY
+		else if(islike(path, "/net"))  sys_ppu_thread_sleep(5);
 		if(strstr(path, ".ntfs[") == NULL)
 #endif
 		mount_with_mm(path, MOUNT_NORMAL); // mount path & do eject
diff --git a/include/firmware.h b/include/firmware.h
index 2cfa25e76..663486cb5 100644
--- a/include/firmware.h
+++ b/include/firmware.h
@@ -114,23 +114,23 @@ static void detect_firmware(void)
 		if(SYSCALL_TABLE) break;
 	}
 
-	// alternative detection method
+	// alternative fw detection method if LV2 peek (SC6) is disabled
 	if(!SYSCALL_TABLE)
 	{
 		c_firmware = get_firmware_version(); dex_mode = get_kernel_type();
 
 		if(IS_CEX)
 		{
-			if(c_firmware >= 4.75f) SYSCALL_TABLE = SYSCALL_TABLE_480;
+			if(c_firmware >= 4.75f) SYSCALL_TABLE = SYSCALL_TABLE_480; // same for 4.75, 4.76, 4.78, 4.80, 4.81
 #ifndef LAST_FIRMWARE_ONLY
 			if(c_firmware == 4.70f) SYSCALL_TABLE = SYSCALL_TABLE_470;
-			if(c_firmware >= 4.60f && c_firmware <= 4.66f) SYSCALL_TABLE = SYSCALL_TABLE_460;
+			if(c_firmware >= 4.60f && c_firmware <= 4.66f) SYSCALL_TABLE = SYSCALL_TABLE_460; // same for 4.60, 4.65, 4.66
 			if(c_firmware == 4.55f) SYSCALL_TABLE = SYSCALL_TABLE_455;
 			if(c_firmware == 4.53f) SYSCALL_TABLE = SYSCALL_TABLE_453;
 			if(c_firmware == 4.50f) SYSCALL_TABLE = SYSCALL_TABLE_450;
 			if(c_firmware == 4.46f) SYSCALL_TABLE = SYSCALL_TABLE_446;
-			if(c_firmware >= 4.40f && c_firmware <= 4.41f) SYSCALL_TABLE = SYSCALL_TABLE_440;
-			if(c_firmware >= 4.30f && c_firmware <= 4.31f) SYSCALL_TABLE = SYSCALL_TABLE_430;
+			if(c_firmware >= 4.40f && c_firmware <= 4.41f) SYSCALL_TABLE = SYSCALL_TABLE_440; // same for 4.40, 4.41
+			if(c_firmware >= 4.30f && c_firmware <= 4.31f) SYSCALL_TABLE = SYSCALL_TABLE_430; // same for 4.30, 4.31
 			if(c_firmware == 4.21f) SYSCALL_TABLE = SYSCALL_TABLE_421;
 			if(c_firmware == 3.55f) SYSCALL_TABLE = SYSCALL_TABLE_355;
 #endif
@@ -138,17 +138,17 @@ static void detect_firmware(void)
 		}
 		if(IS_DEX)
 		{
-			if(c_firmware >= 4.80f) SYSCALL_TABLE = SYSCALL_TABLE_480D;
+			if(c_firmware >= 4.80f) SYSCALL_TABLE = SYSCALL_TABLE_480D; // same for 4.80-4.81
 #ifndef LAST_FIRMWARE_ONLY
-			if(c_firmware == 4.75f) SYSCALL_TABLE = SYSCALL_TABLE_475D;
+			if(c_firmware >= 4.75f && c_firmware <= 4.78f) SYSCALL_TABLE = SYSCALL_TABLE_475D; // same for 4.75, 4.76, 4.78
 			if(c_firmware == 4.70f) SYSCALL_TABLE = SYSCALL_TABLE_470D;
-			if(c_firmware >= 4.60f && c_firmware <= 4.66f) SYSCALL_TABLE = SYSCALL_TABLE_460D;
+			if(c_firmware >= 4.60f && c_firmware <= 4.66f) SYSCALL_TABLE = SYSCALL_TABLE_460D; // same for 4.60, 4.65, 4.66
 			if(c_firmware == 4.55f) SYSCALL_TABLE = SYSCALL_TABLE_455D;
 			if(c_firmware == 4.53f) SYSCALL_TABLE = SYSCALL_TABLE_453D;
 			if(c_firmware == 4.50f) SYSCALL_TABLE = SYSCALL_TABLE_450D;
 			if(c_firmware == 4.46f) SYSCALL_TABLE = SYSCALL_TABLE_446D;
-			if(c_firmware >= 4.40f && c_firmware <= 4.41f) SYSCALL_TABLE = SYSCALL_TABLE_440D;
-			if(c_firmware >= 4.30f && c_firmware <= 4.31f) SYSCALL_TABLE = SYSCALL_TABLE_430D;
+			if(c_firmware >= 4.40f && c_firmware <= 4.41f) SYSCALL_TABLE = SYSCALL_TABLE_440D; // same for 4.40, 4.41
+			if(c_firmware >= 4.30f && c_firmware <= 4.31f) SYSCALL_TABLE = SYSCALL_TABLE_430D; // same for 4.30, 4.31
 			if(c_firmware == 4.21f) SYSCALL_TABLE = SYSCALL_TABLE_421D;
 			if(c_firmware == 3.55f) SYSCALL_TABLE = SYSCALL_TABLE_355D;
 #endif
diff --git a/include/games_html.h b/include/games_html.h
index 609950b23..fd3348a87 100644
--- a/include/games_html.h
+++ b/include/games_html.h
@@ -920,7 +920,9 @@ static void set_sort_key(char *skey, char *templn, int key, u8 subfolder, u8 f1)
 
 static bool is_iso_file(char *entry_name, int flen, u8 f1, u8 f0)
 {
+#if defined(COBRA_ONLY) || defined(MOUNT_ROMS)
 	char *ext = entry_name + flen - 4;
+#endif
 #ifdef MOUNT_ROMS
 	if(IS_ROMS_FOLDER)
 		return (flen > 4) && (strcasestr(ROMS_EXTENSIONS, ext) != NULL);
diff --git a/include/games_xml.h b/include/games_xml.h
index a60ee4d7b..52f46d2d2 100644
--- a/include/games_xml.h
+++ b/include/games_xml.h
@@ -594,6 +594,8 @@ static bool update_mygames_xml(u64 conn_s_p)
 								read_e += sprintf(tempstr + read_e, XML_PAIR("info","%s | %s"), tempID, drives[f0] + 1);
 							else
 								read_e += sprintf(tempstr + read_e, XML_PAIR("info","%s"), drives[f0] + 1);
+
+							if(f1 < 2) read_e += sprintf(tempstr + read_e, " | JB");
 						}
 
 						sprintf(tempstr + read_e, "</Table>");
@@ -713,6 +715,8 @@ static bool update_mygames_xml(u64 conn_s_p)
 									read_e += sprintf(tempstr + read_e, XML_PAIR("info","%s | %s"), tempID, drives[f0] + 5);
 								else
 									read_e += sprintf(tempstr + read_e, XML_PAIR("info","%s"), drives[f0] + 5);
+
+								if(f1 < 2) read_e += sprintf(tempstr + read_e, " | JB");
 							}
 
 							sprintf(tempstr + read_e, "</Table>");
diff --git a/include/html.h b/include/html.h
index 4c73b0f11..64191c286 100644
--- a/include/html.h
+++ b/include/html.h
@@ -296,12 +296,14 @@ static size_t add_option_item(int value, const char *label, bool selected, char
 	return concat(buffer, templn);
 }
 
+#if defined(VIDEO_REC) || defined(USE_UACCOUNT)
 static size_t add_string_item(const char *value, const char *label, bool selected, char *buffer)
 {
 	char templn[MAX_LINE_LEN];
 	sprintf(templn, "<option value=\"%s\"%s/>%s</option>", value, selected?ITEM_SELECTED : "", label);
 	return concat(buffer, templn);
 }
+#endif
 
 static size_t prepare_header(char *buffer, const char *param, u8 is_binary)
 {
diff --git a/include/xmb_savebmp.h b/include/xmb_savebmp.h
index a3840f465..2dca7fdcc 100644
--- a/include/xmb_savebmp.h
+++ b/include/xmb_savebmp.h
@@ -136,7 +136,7 @@ static void saveBMP(char *path, bool notify_bmp)
 	memcpy(bmp_header + 34, &tmp, 4);     // bmp data size
 
 	// write bmp header
-	cellFsWrite(fd, (void *)bmp_header, sizeof(bmp_header), 0);
+	cellFsWrite(fd, (void *)bmp_header, sizeof(bmp_header), NULL);
 
 	uint32_t i, k, idx, ww = w/2;
 
@@ -161,7 +161,7 @@ static void saveBMP(char *path, bool notify_bmp)
 		}
 
 		// write bmp data
-		cellFsWrite(fd, (void *)bmp_buf, idx, 0);
+		cellFsWrite(fd, (void *)bmp_buf, idx, NULL);
 	}
 
 	// padding
diff --git a/main.c b/main.c
index aca200cb2..0579f8af6 100644
--- a/main.c
+++ b/main.c
@@ -61,6 +61,9 @@
  #undef WM_CUSTOM_COMBO
 #endif
 
+#define IS_ON_XMB		(GetCurrentRunningMode() == 0)
+#define IS_INGAME		(GetCurrentRunningMode() != 0)
+
 #include "types.h"
 #include "common.h"
 #include "cobra/cobra.h"
@@ -81,6 +84,38 @@ static char search_url[50];
 
 #ifdef COBRA_ONLY
  #include "cobra/netiso.h"
+/////////////////////////////////////
+ #ifdef LITE_EDITION
+	#define EDITION_ " [Lite]"
+ #elif defined(PS3NET_SERVER) && defined(NET3NET4) && defined(XMB_SCREENSHOT)
+	#define EDITION_ " [Full]"
+ #else
+  #ifdef PS3MAPI
+	#ifdef REX_ONLY
+		#define EDITION_ " [Rebug-PS3MAPI]"
+	#else
+		#define EDITION_ " [PS3MAPI]"
+	#endif
+  #else
+   #ifdef REX_ONLY
+	#define EDITION_ " [Rebug]"
+   #else
+	#define EDITION_ ""
+   #endif
+  #endif
+ #endif
+#else
+ #define EDITION_ " [nonCobra]"
+ #undef PS3MAPI
+ #undef WM_PROXY_SPRX
+#endif
+
+#ifdef USE_NTFS
+#define EDITION			" (NTFS)" EDITION_			// webMAN version (NTFS)
+#else
+#define EDITION			EDITION_					// webMAN version
+#endif
+/////////////////////////////////////
 
 SYS_MODULE_INFO(WWWD, 0, 1, 1);
 SYS_MODULE_START(wwwd_start);
@@ -344,9 +379,6 @@ static u32 BUFFER_SIZE_ROM	= (  _32KB_ / 2);
 #define CODE_GOBACK         1222
 #define CODE_CLOSE_BROWSER  1223
 
-#define IS_ON_XMB		(GetCurrentRunningMode() == 0)
-#define IS_INGAME		(GetCurrentRunningMode() != 0)
-
 ////////////
 
 #ifdef COBRA_ONLY
@@ -750,43 +782,6 @@ static u8 mount_unk = EMU_OFF;
 static char current_file[STD_PATH_LEN+1];
 #endif
 
-/////////////////////////////////////
- #ifdef LITE_EDITION
-	#define EDITION_ " [Lite]"
- #elif defined(PS3NET_SERVER) && defined(NET3NET4) && defined(XMB_SCREENSHOT)
-	#define EDITION_ " [Full]"
- #else
-  #ifdef PS3MAPI
-	#ifdef REX_ONLY
-		#define EDITION_ " [Rebug-PS3MAPI]"
-	#else
-		#define EDITION_ " [PS3MAPI]"
-	#endif
-  #else
-   #ifdef REX_ONLY
-	#define EDITION_ " [Rebug]"
-   #else
-	#define EDITION_ ""
-   #endif
-  #endif
- #endif
-#else
- #ifdef CCAPI
-	#define EDITION_ " [CCAPI]"
- #else
-	#define EDITION_ " [nonCobra]"
- #endif
- #undef PS3MAPI
- #undef WM_PROXY_SPRX
-#endif
-
-#ifdef USE_NTFS
-#define EDITION			" (NTFS)" EDITION_			// webMAN version (NTFS)
-#else
-#define EDITION			EDITION_					// webMAN version
-#endif
-/////////////////////////////////////
-
 #include "include/eject_insert.h"
 
 #ifdef COBRA_ONLY
@@ -2317,7 +2312,6 @@ static void handleclient(u64 conn_s_p)
 
 				stop_prx_module();
 				sys_ppu_thread_exit(0);
-				break;
 			}
 			if(islike(param, "/shutdown.ps3"))
 			{