diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3708d3590..0441197fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,6 +174,19 @@ IF(JPEG_FOUND)
 ELSE()
 	MESSAGE(WARNING "libjpeg library NOT available. Who cares?")
 	SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};NO_JPEG)
+	SET(JPEG_LIBRARIES)
+ENDIF()
+
+SET(FTE_DEP_DBUS true CACHE BOOL "Link against libdbus.")
+IF(FTE_DEP_DBUS)
+	FIND_PACKAGE(DBus1)
+ENDIF()
+IF(DBUS1_FOUND)
+	INCLUDE_DIRECTORIES( ${DBus1_INCLUDE_DIRS} )
+	SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};HAVE_DBUS)
+	SET(FTE_LIBS ${FTE_LIBS} ${DBus1_LIBRARIES})
+ELSE()
+	MESSAGE(WARNING "libdbus-1 library NOT available. Who cares?")
 ENDIF()
 
 SET(FTE_DEP_PNG true CACHE BOOL "Link against libpng.")
@@ -187,6 +200,7 @@ IF(PNG_FOUND)
 ELSE()
 	MESSAGE(WARNING "libpng library NOT available. Good luck with screenshots.")
 	SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};NO_PNG)
+	SET(PNG_LIBRARIES)
 ENDIF()
 
 SET(FTE_DEP_FREETYPE true CACHE BOOL "Link against libfreetype.")
@@ -221,7 +235,7 @@ ELSE()
 ENDIF()
 
 SET(FTE_DEP_VORBISFILE true CACHE BOOL "Link against libvorbisfile.")
-IF(FTE_DEP_VROBISFILE)
+IF(FTE_DEP_VORBISFILE)
 	FIND_LIBRARY(VORBISFILE_LIBRARY NAMES vorbisfile)
 ENDIF()
 IF(NOT VORBISFILE_LIBRARY)
@@ -230,18 +244,30 @@ IF(NOT VORBISFILE_LIBRARY)
 	SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};NO_OGG)
 ENDIF()
 
+IF(CMAKE_BUILD_TYPE MATCHES "Debug")
+	SET(FTE_WERROR true CACHE BOOL "Warnings as errors.")
+ELSE()
+	SET(FTE_WERROR false CACHE BOOL "Warnings as errors.")
+ENDIF()
+IF(FTE_WERROR)
+	SET(FTE_WERROR_ARG "-Werror")
+ELSE()
+	SET(FTE_WERROR_ARG "")
+ENDIF()
+
 IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-pointer-sign")
 
 	IF(CMAKE_BUILD_TYPE MATCHES "Debug")
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wno-pointer-sign -Wno-unknown-pragmas -Wno-format-zero-length -Wno-strict-aliasing -Wno-error=cpp")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall ${FTE_WERROR_ARG} -Wno-pointer-sign -Wno-unknown-pragmas -Wno-format-zero-length -Wno-strict-aliasing -Wno-error=cpp")
 	ELSE()
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 ${FTE_WERROR_ARG}")
 	ENDIF()
 endif()
 IF(CMAKE_C_COMPILER_ID MATCHES "GNU")
 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-prototypes")			#
 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wold-style-definition")		#k&r c is weird and can't cope with 64bit types.
+	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-parameter-type")		#k&r c is weird and can't cope with 64bit types.
 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wold-style-declaration")		#
 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")				#void* stuff
 	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wvla")							#msvc doesn't support vla
@@ -254,9 +280,9 @@ IF(CMAKE_C_COMPILER_ID MATCHES "GNU")
 	#might as well do this, public builds use the regular Makefile.
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native")
 	IF(CMAKE_BUILD_TYPE MATCHES "Debug")
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wno-pointer-sign -Wno-unknown-pragmas -Wno-format-zero-length -Wno-strict-aliasing -Wno-error=cpp")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall ${FTE_WERROR_} -Wno-pointer-sign -Wno-unknown-pragmas -Wno-format-zero-length -Wno-strict-aliasing -Wno-error=cpp")
 	ELSE()
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 ${FTE_WERROR_}")
 	ENDIF()
 	IF (NOT FTE_USE_SDL)
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,--warn-common")
@@ -266,8 +292,8 @@ ENDIF()
 IF(CMAKE_BUILD_TYPE MATCHES "Debug")
 	IF(NOT ${WIN32})
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu89")
 	ENDIF()
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu89")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DEBUG")
 ENDIF()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")
@@ -289,6 +315,32 @@ FUNCTION(EMBED_PLUGIN_META PLUGNAME PLUGTITLE PLUGDESC)
 		VERBATIM)
 ENDFUNCTION()
 
+SET(FTE_DEP_GNUTLS true CACHE BOOL "Link against gnutls")
+IF(FTE_DEP_GNUTLS)
+	FIND_PACKAGE(GnuTLS)
+	IF(NOT GNUTLS_FOUND)
+		MESSAGE(WARNING "gnutls library NOT available. HTTPS/DTLS will not be available.")
+		SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};NO_GNUTLS)
+	ELSE()
+		IF(WIN32)
+			SET(GNUTLS_STATIC true CACHE BOOL "Link gnutls statically.") #usually as an .so though. :/
+		ELSE()
+			SET(GNUTLS_STATIC false CACHE BOOL "Link gnutls statically.") #usually as an .so though. :/
+		ENDIF()
+		IF(GNUTLS_STATIC)
+			SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};GNUTLS_STATIC)
+			SET(FTE_LIBS ${FTE_LIBS} ${GNUTLS_LIBRARY})
+			SET(FTESV_LIBS ${FTESV_LIBS} ${GNUTLS_LIBRARY})
+		ENDIF()
+	ENDIF()
+ENDIF()
+IF(WIN32)
+	SET(FTE_DEP_WINSSPI true CACHE BOOL "Link against winsspi(schannel)")
+	IF(NOT FTE_DEP_WINSSPI)
+		SET(FTE_DEFINES ${FTE_DEFINES};NO_WINSSPI)
+	ENDIF()
+ENDIF()
+
 IF(${ANDROID})
 #	FIND_PACKAGE(Freetype REQUIRED)
 
@@ -315,6 +367,7 @@ ELSEIF(WIN32 AND NOT FTE_USE_SDL)
 		engine/client/winquake.rc
 		engine/common/sys_win_threads.c
 		engine/common/net_ssl_winsspi.c
+		engine/common/net_ssl_gnutls.c
 		engine/common/fs_win32.c
 		engine/client/cd_win.c
 		engine/client/in_win.c
@@ -345,25 +398,13 @@ ELSEIF(WIN32 AND NOT FTE_USE_SDL)
 		engine/client/winquake.rc
 		engine/common/sys_win_threads.c
 		engine/common/net_ssl_winsspi.c
+		engine/common/net_ssl_gnutls.c
 		engine/common/fs_win32.c
 		engine/server/sv_sys_win.c
 	)
 ELSEIF(UNIX AND NOT FTE_USE_SDL)	#linux(ish)
 				#openbsd will have issues with snd_linux.c
 
-	FIND_PACKAGE(GnuTLS)
-	IF(NOT GNUTLS_FOUND)
-		MESSAGE(WARNING "gnutls library NOT available. HTTPS/DTLS will not be available.")
-		SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};NO_GNUTLS)
-	ELSE()
-		SET(GNUTLS_STATIC false CACHE BOOL "Link gnutls statically.") #usually as an .so though. :/
-		IF(GNUTLS_STATIC)
-			SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};GNUTLS_STATIC)
-			SET(FTE_LIBS ${FTE_LIBS} ${GNUTLS_LIBRARY})
-			SET(FTESV_LIBS ${FTESV_LIBS} ${GNUTLS_LIBRARY})
-		ENDIF()
-	ENDIF()
-
 	#linux-only packages
 	FIND_PACKAGE(ALSA)
 	IF(ALSA_FOUND)
@@ -382,6 +423,10 @@ ELSEIF(UNIX AND NOT FTE_USE_SDL)	#linux(ish)
 			SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};NO_X11_RANDR)
 			MESSAGE(WARNING "Xrandr library NOT available.")
 		ENDIF()
+		IF (NOT X11_Xscreensaver_FOUND)
+			SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};NO_X11_XSS)
+			MESSAGE(WARNING "Xss library NOT available.")
+		ENDIF()
 	ELSE()
 		MESSAGE(WARNING "x11 library NOT available.")
 		SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES};NO_X11)
@@ -450,7 +495,7 @@ ELSEIF(UNIX AND NOT FTE_USE_SDL)	#linux(ish)
 		ENDIF()
 	ENDIF()
 
-	SET(FTESV_DEFINES MULTITHREAD)
+	SET(FTESV_DEFINES ${FTESV_DEFINES};MULTITHREAD)
 	SET(FTESV_ARCH_FILES ${FTESV_ARCH_FILES}
 		engine/server/sv_sys_unix.c
 		engine/common/sys_linux_threads.c
@@ -481,7 +526,7 @@ ELSEIF(1)	#SDL
 		engine/gl/gl_vidsdl.c
 	)
 
-	SET(FTESV_DEFINES FTE_SDL)
+	SET(FTESV_DEFINES ${FTESV_DEFINES};MULTITHREAD)
 	SET(FTESV_LIBS ${FTESV_LIBS} ${SYS_LIBS} ${CMAKE_DL_LIBS} ${SDL2_LIBRARIES})
 
 	IF(WIN32)
@@ -505,6 +550,7 @@ ELSEIF(1)	#SDL
 			engine/common/sys_linux_threads.c
 			engine/server/sv_sys_unix.c
 		)
+		SET(FTESV_LIBS ${FTESV_LIBS} pthread)
 	ENDIF()
 ELSE()
 #	engine/common/sys_linux_threads.c
@@ -862,7 +908,7 @@ SET(FTE_Q3_FILES
 )
 
 #For annoying compressed gltf2 files.
-SET(FTE_DEP_DRACO false CACHE BOOL "Link against libdraco.")
+SET(FTE_DEP_DRACO false CACHE BOOL "Link against libdraco (apache2).")
 IF(FTE_DEP_DRACO)
 	FIND_LIBRARY(
 		DRACO_LIBRARY
@@ -1052,8 +1098,8 @@ ELSE()
 			imgtool.c
 			iqm/iqm.h
 		)
-		SET_TARGET_PROPERTIES(iqmtool PROPERTIES COMPILE_DEFINITIONS "IQMTOOL;${DRACO_CFLAGS};${FTE_REVISON}")
-		TARGET_LINK_LIBRARIES(iqmtool ${CMAKE_DL_LIBS} ${DRACO_LIBRARY})
+		SET_TARGET_PROPERTIES(iqmtool PROPERTIES COMPILE_DEFINITIONS "IQMTOOL;${DRACO_CFLAGS};${FTE_LIB_DEFINES};${FTE_REVISON}")
+		TARGET_LINK_LIBRARIES(iqmtool ${CMAKE_DL_LIBS} ${DRACO_LIBRARY} ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
 		SET(INSTALLTARGS ${INSTALLTARGS} iqmtool)
 	ENDIF()
 
@@ -1151,6 +1197,7 @@ ELSE()
 			engine/qclib/qcc_pr_lex.c
 			engine/qclib/qccmain.c
 			engine/qclib/qcd_main.c
+			engine/qclib/decomp.c
 			engine/qclib/packager.c
 		)
 		SET_TARGET_PROPERTIES(fteqcc PROPERTIES COMPILE_DEFINITIONS "${FTE_LIB_DEFINES};${FTE_REVISON}")
@@ -1260,6 +1307,8 @@ SET(FTE_PLUG_OPENSSL false CACHE BOOL "Compile OpenSSL.")
 IF(FTE_PLUG_OPENSSL)
 	#the openssl license is incompatible with the GPL, so while we have code to use it distributing the binaries built with it is not a (legal) option.
 	#note that openssl 3.0.0 upwards are apache-2 licensed, which IS gpl-3 compatible (though not gpl-2). debian has not caught up with that yet, however.
+	#Crosscompile linux->win64: sudo ln -s ${pwd}/engine/libs-x86_64-w64-mingw32/openssl-openssl-3.0.1/ /usr/x86_64-w64-mingw32/OpenSSL
+	SET(OPENSSL_USE_STATIC_LIBS true CACHE BOOL "Link openssl statically.") #usually as an .so though. :/)
 	FIND_PACKAGE(OpenSSL)
 	IF(OPENSSL_VERSION_MAJOR LESS 3)
 		SET(FTE_PRIVATE_USE_ONLY false CACHE BOOL "Ignore license violations.")
@@ -1275,11 +1324,15 @@ IF(FTE_PLUG_OPENSSL)
 			MESSAGE(WARNING "Using openssl. Resulting plugin must be licensed as GPLv3.")
 		ENDIF()
 		SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES})
+		if (WIN32)
+			SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} ws2_32)
+		ENDIF()
 
 		ADD_LIBRARY(plug_openssl MODULE
 			plugins/plugin.c
 			plugins/net_ssl_openssl.c
 		)
+		TARGET_INCLUDE_DIRECTORIES(plug_openssl PRIVATE ${OPENSSL_INCLUDE_DIR})
 		SET_TARGET_PROPERTIES(plug_openssl PROPERTIES COMPILE_DEFINITIONS "FTEPLUGIN;${FTE_LIB_DEFINES}")
 		TARGET_LINK_LIBRARIES(plug_openssl ${SYS_LIBS} ${OPENSSL_LIBRARIES})
 
@@ -1291,7 +1344,7 @@ ENDIF()
 #IF(FTE_PLUG_GNUTLS)
 #	FIND_PACKAGE(GnuTLS)
 #	IF(NOT GNUTLS_FOUND)
-#		MESSAGE(WARNING "openssl library NOT available. you'll have to use some other library.")
+#		MESSAGE(WARNING "gnutls library NOT available. you'll have to use some other library.")
 #	ELSE()
 #		SET(FTE_LIB_DEFINES ${FTE_LIB_DEFINES})
 #
@@ -1628,7 +1681,8 @@ IF(FTE_MENU_SYS)
 		DEPENDS fteqcc
 		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/quakec/menusys/"
 		COMMAND fteqcc -srcfile "menu.src" -o "${CMAKE_CURRENT_BINARY_DIR}/menu.dat" -DREVISION="${SVNREVISION}" -DDATE="${FTE_DATE}" -DBRANCH="${FTE_BRANCH}"
-		BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/menu.dat" "${CMAKE_CURRENT_BINARY_DIR}/menu.lno"
+		COMMAND /bin/echo -e "{\\n	package fte_menusys\\n	ver \"${SVNREVISION}\"\\n	category Plugins\\n	title \"Replacement Menus\"\\n	gamedir \"id1\"\\n	desc \"Modern menus to replace the ancient quake ones\"\\n}" | zip -j -q -9 -fz- "${CMAKE_CURRENT_BINARY_DIR}/menusys.pk3" - "${CMAKE_CURRENT_BINARY_DIR}/menu.dat"
+		BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/menu.dat" "${CMAKE_CURRENT_BINARY_DIR}/menu.lno" "${CMAKE_CURRENT_BINARY_DIR}/menusys.pk3"
 		SOURCES
 			quakec/menusys/menu.src
 			quakec/menusys/fteextensions.qc
@@ -1665,12 +1719,8 @@ IF(FTE_MENU_SYS)
 			quakec/menusys/menu/quit.qc
 	)
 
-	ADD_CUSTOM_COMMAND(
-		TARGET menusys POST_BUILD
-		COMMAND /bin/echo -e "{\\n	package fte_menusys\\n	ver \"${SVNREVISION}\"\\n	category Plugins\\n	title \"Replacement Menus\"\\n	gamedir \"id1\"\\n	desc \"Modern menus to replace the ancient quake ones\"\\n}" | zip -q -9 -fz- menusys.pk3 - menu.dat
-		VERBATIM)
 	INSTALL(FILES
-		menusys.pk3
+		${CMAKE_CURRENT_BINARY_DIR}/menusys.pk3
 		DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/games/quake/id1/")
 ENDIF()
 
@@ -1681,7 +1731,8 @@ IF(FTE_CSADDON)
 		DEPENDS fteqcc
 		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/quakec/csaddon/src/"
 		COMMAND fteqcc -srcfile "csaddon.src" -o "${CMAKE_CURRENT_BINARY_DIR}/csaddon.dat"
-		BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/csaddon.dat" "${CMAKE_CURRENT_BINARY_DIR}/csaddon.lno"
+		COMMAND /bin/echo -e "{\\n	package fte_csaddon\\n	ver \"${SVNREVISION}\"\\n	category Plugins\\n	title \"${PLUGTITLE}\"\\n	gamedir \"id1\"\\n	desc \"${PLUGDESC}\"\\n}" | zip -j -q -9 -fz- "${CMAKE_CURRENT_BINARY_DIR}/csaddon.pk3" - "${CMAKE_CURRENT_BINARY_DIR}/csaddon.dat"
+		BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/csaddon.dat" "${CMAKE_CURRENT_BINARY_DIR}/csaddon.lno" "${CMAKE_CURRENT_BINARY_DIR}/csaddon.pk3"
 		SOURCES
 			quakec/csaddon/src/csaddon.src
 
@@ -1704,11 +1755,7 @@ IF(FTE_CSADDON)
 			quakec/csaddon/src/csaddon.qc
 	)
 
-	ADD_CUSTOM_COMMAND(
-		TARGET csaddon POST_BUILD
-		COMMAND /bin/echo -e "{\\n	package fte_csaddon\\n	ver \"${SVNREVISION}\"\\n	category Plugins\\n	title \"${PLUGTITLE}\"\\n	gamedir \"id1\"\\n	desc \"${PLUGDESC}\"\\n}" | zip -q -9 -fz- csaddon.pk3 - csaddon.dat
-		VERBATIM)
 	INSTALL(FILES
-		csaddon.pk3
+		${CMAKE_CURRENT_BINARY_DIR}/csaddon.pk3
 		DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/games/quake/id1/")
 ENDIF()
diff --git a/engine/Makefile b/engine/Makefile
index 5375e404b..5e358fd64 100644
--- a/engine/Makefile
+++ b/engine/Makefile
@@ -137,14 +137,10 @@ endif
 ifneq (,$(findstring DLINK_QUAKE3,$(FTE_CONFIG_EXTRA)))
     LINK_QUAKE3=1
 endif
+ifeq ($(findstring web,$(FTE_TARGET)),)	#the web target uses javascript/browser loaders for common audio+image files instead of needing to embed our own, which keeps sizes down slightly.
 ifeq (,$(findstring DNO_VORBISFILE,$(FTE_CONFIG_EXTRA)))
     USE_VORBISFILE=1
 endif
-ifneq (,$(findstring DLINK_FREETYPE,$(FTE_CONFIG_EXTRA)))
-    LINK_FREETYPE=1
-    LINK_ZLIB=1
-    LINK_PNG=1
-endif
 ifneq (,$(findstring DLINK_JPEG,$(FTE_CONFIG_EXTRA)))
     LINK_JPEG=1
 endif
@@ -152,6 +148,12 @@ ifneq (,$(findstring DLINK_PNG,$(FTE_CONFIG_EXTRA)))
     LINK_ZLIB=1
     LINK_PNG=1
 endif
+endif
+ifneq (,$(findstring DLINK_FREETYPE,$(FTE_CONFIG_EXTRA)))
+    LINK_FREETYPE=1
+    LINK_ZLIB=1
+    LINK_PNG=1
+endif
 ifneq (,$(findstring -Os,$(FTE_CONFIG_EXTRA)))
     CPUOPTIMIZATIONS+=-Os
     BRANDFLAGS:=$(filter-out -O%,$(BRANDFLAGS))
@@ -164,6 +166,12 @@ ifneq (,$(findstring DLINK_INTERNAL_BULLET,$(FTE_CONFIG_EXTRA)))
 	#bullet plugin will be built into the exe itself
     INTERNAL_BULLET=1
 endif
+ifneq (,$(findstring DLINK_EZHUD,$(FTE_CONFIG_EXTRA)))
+    LINK_EZHUD=1
+endif
+ifneq (,$(findstring DLINK_OPENSSL,$(FTE_CONFIG_EXTRA)))
+    LINK_OPENSSL=1
+endif
 
 ifeq ($(BITS),64)
     CC:=$(CC) -m64
@@ -249,8 +257,9 @@ DO_CMAKE=cmake -DCMAKE_C_COMPILER="$(firstword $(CC))" -DCMAKE_C_FLAGS="$(wordli
 
 ifeq ($(DROID_ARCH),)
 	#armeabi armeabi-v7a arm64-v8a x86 x86_64 mips mips64
-	DROID_ARCH=armeabi-v7a
-	DROID_ARCH+=x86
+	DROID_ARCH+=armeabi-v7a	#old 32bit android. yucky.
+	DROID_ARCH+=arm64-v8a	#modern android devices are 64bit-only. urgh.
+	DROID_ARCH+=x86			#mostly for testing...
 	#DROID_ARCH+=x86_64	#starting with DROID_API_LEVEL 21
 endif
 ifeq ($(FTE_TARGET),droid)
@@ -632,8 +641,6 @@ ifeq (win,$(findstring cyg,$(FTE_TARGET))$(findstring win,$(FTE_TARGET)))
 #	OGGVORBISLDFLAGS=$(MINGW_LIBS_DIR)/libvorbisfile.a $(MINGW_LIBS_DIR)/libvorbis.a $(MINGW_LIBS_DIR)/libogg.a
 endif
 
-OGGVORBISLDFLAGS ?= -lvorbisfile -lvorbis -logg
-
 #BASELDFLAGS=-lm  -lz
 XLDFLAGS=-L$(ARCHLIBS) $(IMAGELDFLAGS)
 
@@ -987,8 +994,8 @@ ifeq (1,$(LINK_QUAKE3))
 		l_struct.o	
 endif
 
-COMMONLIBFLAGS=
-COMMONLDDEPS=
+COMMONLIBFLAGS?=
+COMMONLDDEPS?=
 CLIENTLIBFLAGS=$(COMMONLIBFLAGS) $(LIBOPUS_STATIC) $(LIBSPEEX_STATIC) $(OGGVORBISFILE_STATIC)
 SERVERLIBFLAGS=$(COMMONLIBFLAGS)
 CLIENTLDDEPS=$(COMMONLDDEPS) $(LIBOPUS_LDFLAGS) $(LIBSPEEX_LDFLAGS) $(OGGVORBISLDFLAGS)
@@ -997,14 +1004,17 @@ ifeq (1,$(USE_OPUS))
     LIBOPUS_STATIC=-DOPUS_STATIC
     LIBOPUS_LDFLAGS=-lopus
     ALL_CFLAGS+=-I/usr/include/opus
+    MAKELIBS+=libs-$(ARCH)/libopus.a
 endif
 ifeq (1,$(USE_SPEEX))
     LIBSPEEX_STATIC=-DSPEEX_STATIC
     LIBSPEEX_LDFLAGS=-lspeex -lspeexdsp
+    MAKELIBS+=libs-$(ARCH)/libspeex.a libs-$(ARCH)/libspeexdsp.a
 endif
 
 ifeq (1,$(USE_VORBISFILE))
     OGGVORBISFILE_STATIC=-DLIBVORBISFILE_STATIC
+    OGGVORBISLDFLAGS ?= -lvorbisfile -lvorbis -logg
 else
     OGGVORBISLDFLAGS=
     OGGVORBISFILE_STATIC=
@@ -1062,6 +1072,34 @@ ifeq (1,$(strip $(INTERNAL_BULLET)))
     LDCC=$(CXX)
     MAKELIBS+=libs-$(ARCH)/libBulletDynamics.a
 endif
+ifeq (1,$(LINK_EZHUD))
+    VPATH := $(VPATH) : $(BASE_DIR)/../plugins/ezhud
+    ALL_CFLAGS+=-DSTATIC_EZHUD #let the plugins code know it needs to add the appropriate entry.
+    CLIENT_OBJS += \
+		ezquakeisms.o	\
+		hud.o			\
+		hud_common.o	\
+		hud_editor.o
+endif
+ifeq (1,$(LINK_OPENSSL))
+    ifeq (1,$(shell $(PKGCONFIG) --version-atleast 3 openssl && echo 1))	#must exist... and if its not openssl3 then its not gpl3-compatible so refuse to use it.
+        VPATH := $(VPATH) : $(BASE_DIR)/../plugins
+        ALL_CFLAGS+=-DSTATIC_OPENSSL #let the plugins code know it needs to add the appropriate entry.
+        COMMON_OBJS += \
+            net_ssl_openssl.o
+        ALL_DFLAGS+=$(shell $(PKGCONFIG) openssl --cflags --silence-errors)
+        COMMONLDDEPS+=$(shell $(PKGCONFIG) openssl --libs --silence-errors)
+    endif
+endif
+
+ifeq (1,$(shell $(PKGCONFIG) --exists gnutls && echo 1))
+    ALL_CFLAGS+=$(shell $(PKGCONFIG) gnutls --cflags --silence-errors)
+    #ALL_CFLAGS+=-DGNUTLS_STATIC
+    #COMMONLDDEPS+=$(shell $(PKGCONFIG) gnutls --static --libs --silence-errors)	#we soft-link, so we don't need the -lgnutls stuff.
+else
+    ALL_CFLAGS+=-DNO_GNUTLS
+endif
+
 
 #the defaults for sdl come first
 #CC_MACHINE:=$(shell $(CC) -dumpmachine)
@@ -1761,13 +1799,14 @@ ifeq ($(FTE_TARGET),web)
 	#GLCL_OBJS=$(GL_OBJS) $(D3DGL_OBJS) $(GLQUAKE_OBJS) cd_null.o
 	#GL_LDFLAGS=$(GLLDFLAGS)
 	GLB_DIR=gl_web
+	GLCL_DIR=glcl_web
 	GL_EXE_NAME=../ftewebgl.js
+	GLCL_EXE_NAME=../ftewebglcl.js
 
 	GL_LDFLAGS=$(GLLDFLAGS) $(IMAGELDFLAGS)
-	GL_CFLAGS=$(GLCFLAGS)
+	GL_CFLAGS=$(GLCFLAGS) $(CLIENTLIBFLAGS)
 
 	IMAGELDFLAGS=
-	CLIENTLDDEPS=
 	SERVERLDDEPS=
 
 	#generate deps properly
@@ -2074,17 +2113,24 @@ qccgui-scintilla: scintilla$(BITS)_static
 	@LTO= $(MAKE) _qcc-tmp TYPE=_out-rel REQDIR=reldir EXE_NAME="../fteqccgui$(BITS)" OUT_DIR="$(RELEASE_DIR)/$(QCC_DIR)scin" SOBJS="qccgui.o qccguistuff.o packager.o decomp.o fteqcc.o" WCFLAGS="$(WCFLAGS) -DSCISTATIC" LDFLAGS="$(LDFLAGS) $(RELEASE_DIR)/scintilla$(BITS).a -static -luuid -lole32 -limm32 -lstdc++ -loleaut32 -lcomdlg32 -lcomctl32 -lshlwapi -mwindows"
 
 ifdef windir
-debugdir:
-	@-mkdir -p "$(subst /,\, $(OUT_DIR))"
-reldir:
+outdir:
+ifneq "$(OUT_DIR)" ""
 	@-mkdir -p "$(subst /,\, $(OUT_DIR))"
+endif
+debugdir: outdir
+	@-mkdir -p "$(subst /,\, $(RELEASE_DIR))"
+reldir: outdir
+	@-mkdir -p "$(subst /,\, $(DEBUG_DIR))"
 else
-reldir:
+outdir:
+ifneq "$(OUT_DIR)" ""
+	@-mkdir -p "$(OUT_DIR)"
+endif
+debugdir: outdir
+reldir: outdir
 	@-mkdir -p "$(RELEASE_DIR)"
-	@-mkdir -p "$(OUT_DIR)"
-debugdir:
+debugdir: outdir
 	@-mkdir -p "$(DEBUG_DIR)"
-	@-mkdir -p "$(OUT_DIR)"
 endif
 
 plugins-dbg:
@@ -2172,15 +2218,23 @@ else
 endif
 
 web-rel:
-	@PATH="$(EMSCRIPTENPATH)" $(MAKE) gl-rel FTE_TARGET=web CC="$(EMCC)"
-	cp $(BASE_DIR)/web/fteshell.html $(RELEASE_DIR)/ftewebgl.html
+	@PATH="$(EMSCRIPTENPATH)" $(MAKE) makelibs FTE_TARGET=web CC="$(EMCC)" && PATH="$(EMSCRIPTENPATH)" $(MAKE) gl-rel FTE_TARGET=web CC="$(EMCC)"
+	@cp $(BASE_DIR)/web/fteshell.html $(RELEASE_DIR)/ftewebgl.html
 	@gzip -kf $(RELEASE_DIR)/ftewebgl.html
 	@gzip -kf $(RELEASE_DIR)/ftewebgl.js
 	@gzip -kf $(RELEASE_DIR)/ftewebgl.wasm
+webcl-rel:
+	@PATH="$(EMSCRIPTENPATH)" $(MAKE) makelibs FTE_TARGET=web CC="$(EMCC)" && PATH="$(EMSCRIPTENPATH)" $(MAKE) glcl-rel FTE_TARGET=web CC="$(EMCC)"
+	@cp $(BASE_DIR)/web/fteshell.html $(RELEASE_DIR)/ftewebglcl.html
+	@sed -i 's/ftewebgl.js/ftewebglcl.js/g' release/ftewebglcl.html	#swap out the .js filename for the client-only one.
+	@gzip -kf $(RELEASE_DIR)/ftewebglcl.html
+	@gzip -kf $(RELEASE_DIR)/ftewebglcl.js
+	@gzip -kf $(RELEASE_DIR)/ftewebglcl.wasm
+
 
 web-dbg:
 	@PATH="$(EMSCRIPTENPATH)" $(MAKE) gl-dbg FTE_TARGET=web CC="$(EMCC)"
-	cp $(BASE_DIR)/web/fteshell.html $(DEBUG_DIR)/ftewebgl.html
+	@cp $(BASE_DIR)/web/fteshell.html $(DEBUG_DIR)/ftewebgl.html
 	@gzip -kf $(DEBUG_DIR)/ftewebgl.html
 	@gzip -kf $(DEBUG_DIR)/ftewebgl.js
 	@gzip -kf $(DEBUG_DIR)/ftewebgl.wasm
@@ -2288,23 +2342,26 @@ AR?=$(ARCH)-ar
 CONFIGARGS+= -host=$(ARCH) --enable-shared=no CC="$(CC)"
 CONFIGARGS:= $(CONFIGARGS)
 #--disable-silent-rules
+OPUSCONFIGARGS=$(CONFIGARGS)
 
 TOOLOVERRIDES+=CFLAGS="$$CFLAGS -Os"
+TOOLCONGIGUREOVERRIDES=$(TOOLOVERRIDES)
+TOOLMAKEOVERRIDES=$(TOOLOVERRIDES)
+ifeq (web,$(FTE_TARGET))
+  TOOLCONFIGUREOVERRIDES=emconfigure
+  TOOLMAKEOVERRIDES=emmake
+  OPUSCONFIGARGS=--disable-rtcd --disable-hardening --enable-stack-protector=no --enable-shared=no
+  CONFIGARGS=--enable-shared=no
+endif
 
 
 libs-$(ARCH)/libjpeg.a:
 	test -f jpegsrc.v$(JPEGVER).tar.gz || wget http://www.ijg.org/files/jpegsrc.v$(JPEGVER).tar.gz
-	-test -f libs-$(ARCH)/libjpeg.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../jpegsrc.v$(JPEGVER).tar.gz && cd jpeg-$(JPEGVER) && $(TOOLOVERRIDES) ./configure $(CONFIGARGS) && $(TOOLOVERRIDES) $(MAKE) && cp .libs/libjpeg.a ../ && $(TOOLOVERRIDES) $(AR) -s ../libjpeg.a && cp jconfig.h jerror.h jmorecfg.h jpeglib.h jversion.h ../ )
+	test -f libs-$(ARCH)/libjpeg.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../jpegsrc.v$(JPEGVER).tar.gz && cd jpeg-$(JPEGVER) && $(CONFIGUREOVERRIDES) ./configure $(CONFIGARGS) && $(TOOLOVERRIDES) $(MAKE) && cp .libs/libjpeg.a ../ && $(TOOLOVERRIDES) $(AR) -s ../libjpeg.a && cp jconfig.h jerror.h jmorecfg.h jpeglib.h jversion.h ../ )
 
-ifeq ($(FTE_TARGET),web)
 libs-$(ARCH)/libz.a libs-$(ARCH)/libz.pc:
 	test -f zlib-$(ZLIBVER).tar.gz || wget http://zlib.net/fossils/zlib-$(ZLIBVER).tar.gz
-	-test -f libs-$(ARCH)/libz.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../zlib-$(ZLIBVER).tar.gz && cd zlib-$(ZLIBVER) && emconfigure ./configure --static && emmake $(MAKE) libz.a CC="$(CC) $(W32_CFLAGS) -fPIC" && cp libz.a ../ && $(TOOLOVERRIDES) $(AR) -s ../libz.a && cp zlib.h zconf.h zutil.h zlib.pc ../ )
-else
-libs-$(ARCH)/libz.a libs-$(ARCH)/libz.pc:
-	test -f zlib-$(ZLIBVER).tar.gz || wget http://zlib.net/fossils/zlib-$(ZLIBVER).tar.gz
-	-test -f libs-$(ARCH)/libz.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../zlib-$(ZLIBVER).tar.gz && cd zlib-$(ZLIBVER) && $(TOOLOVERRIDES) ./configure --static && $(TOOLOVERRIDES) $(MAKE) libz.a CC="$(CC) $(W32_CFLAGS) -fPIC" && cp libz.a ../ && $(TOOLOVERRIDES) $(AR) -s ../libz.a && cp zlib.h zconf.h zutil.h zlib.pc ../ )
-endif
+	test -f libs-$(ARCH)/libz.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../zlib-$(ZLIBVER).tar.gz && cd zlib-$(ZLIBVER) && $(TOOLCONFIGUREOVERRIDES) ./configure --static && $(TOOLMAKEOVERRIDES) $(MAKE) libz.a CC="$(CC) $(W32_CFLAGS) -fPIC" && cp libz.a ../ && $(TOOLOVERRIDES) $(AR) -s ../libz.a && cp zlib.h zconf.h zutil.h zlib.pc ../ )
 libs-$(ARCH)/libz9.a: libs-$(ARCH)/libz.a
 	(cd libs-$(ARCH)/zlib-$(ZLIBVER) && \
 		$(CC) -o contrib/infback9/infback9.o -c contrib/infback9/infback9.c -I.	&& \
@@ -2315,35 +2372,35 @@ libs-$(ARCH)/libz9.a: libs-$(ARCH)/libz.a
 
 libs-$(ARCH)/libpng.a libs-$(ARCH)/libpng.pc: libs-$(ARCH)/libz.a libs-$(ARCH)/libz.pc
 	test -f libpng-$(PNGVER).tar.gz || wget http://prdownloads.sourceforge.net/libpng/libpng-$(PNGVER).tar.gz?download -O libpng-$(PNGVER).tar.gz
-	-test -f libs-$(ARCH)/libpng.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../libpng-$(PNGVER).tar.gz && cd libpng-$(PNGVER) && $(TOOLOVERRIDES) ./configure CPPFLAGS=-I$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ LDFLAGS=-L$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ $(CONFIGARGS) --enable-static && $(TOOLOVERRIDES) $(MAKE) && cp .libs/libpng16.a ../libpng.a && cp libpng.pc png*.h ../ )
+	test -f libs-$(ARCH)/libpng.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../libpng-$(PNGVER).tar.gz && cd libpng-$(PNGVER) && $(TOOLOVERRIDES) ./configure CPPFLAGS=-I$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ LDFLAGS=-L$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ $(CONFIGARGS) --enable-static && $(TOOLOVERRIDES) $(MAKE) && cp .libs/libpng16.a ../libpng.a && cp libpng.pc png*.h ../ )
 
 libs-$(ARCH)/libogg.a:
 	test -f libogg-$(OGGVER).tar.gz || wget http://downloads.xiph.org/releases/ogg/libogg-$(OGGVER).tar.gz
-	-test -f libs-$(ARCH)/libogg.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../libogg-$(OGGVER).tar.gz && cd libogg-$(OGGVER) && $(TOOLOVERRIDES) ./configure $(CONFIGARGS) && $(TOOLOVERRIDES) $(MAKE) && cp src/.libs/libogg.a ../ && $(TOOLOVERRIDES) $(AR) -s ../libogg.a && mkdir ../ogg && cp include/ogg/*.h ../ogg)
+	test -f libs-$(ARCH)/libogg.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../libogg-$(OGGVER).tar.gz && cd libogg-$(OGGVER) && $(TOOLOVERRIDES) ./configure $(CONFIGARGS) && $(TOOLOVERRIDES) $(MAKE) && cp src/.libs/libogg.a ../ && $(TOOLOVERRIDES) $(AR) -s ../libogg.a && mkdir ../ogg && cp include/ogg/*.h ../ogg)
 
 libs-$(ARCH)/libvorbis.a: libs-$(ARCH)/libogg.a
 	test -f libvorbis-$(VORBISVER).tar.gz || wget http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBISVER).tar.gz
-	-test -f libs-$(ARCH)/libvorbisfile.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../libvorbis-$(VORBISVER).tar.gz && cd libvorbis-$(VORBISVER) && $(TOOLOVERRIDES) ./configure PKG_CONFIG= $(CONFIGARGS) --disable-oggtest --with-ogg-libraries=.. --with-ogg-includes=$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/libogg-$(OGGVER)/include && $(TOOLOVERRIDES) $(MAKE) && cp lib/.libs/libvorbis.a ../ && cp lib/.libs/libvorbisfile.a ../  && mkdir ../vorbis && cp include/vorbis/*.h ../vorbis)
+	test -f libs-$(ARCH)/libvorbisfile.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../libvorbis-$(VORBISVER).tar.gz && cd libvorbis-$(VORBISVER) && $(TOOLOVERRIDES) ./configure PKG_CONFIG= $(CONFIGARGS) --disable-oggtest --with-ogg-libraries=.. --with-ogg-includes=$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/libogg-$(OGGVER)/include && $(TOOLOVERRIDES) $(MAKE) && cp lib/.libs/libvorbis.a ../ && cp lib/.libs/libvorbisfile.a ../  && mkdir ../vorbis && cp include/vorbis/*.h ../vorbis)
 
 libs-$(ARCH)/libopus.a:
 	test -f opus-$(OPUSVER).tar.gz || wget https://archive.mozilla.org/pub/opus/opus-$(OPUSVER).tar.gz
-	-test -f libs-$(ARCH)/libopus.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../opus-$(OPUSVER).tar.gz && cd opus-$(OPUSVER) && CFLAGS="-D_FORTIFY_SOURCE=0 $(CFLAGS) -Os" $(TOOLOVERRIDES) ./configure $(CONFIGARGS) && $(TOOLOVERRIDES) $(MAKE) && cp .libs/libopus.a ../ && cp include/opus*.h ../)
+	test -f libs-$(ARCH)/libopus.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../opus-$(OPUSVER).tar.gz && cd opus-$(OPUSVER) && CFLAGS="-D_FORTIFY_SOURCE=0 $(CFLAGS) -Os" $(TOOLCONFIGUREOVERRIDES) ./configure $(OPUSCONFIGARGS) --disable-extra-programs && $(TOOLMAKEOVERRIDES) $(MAKE) && cp .libs/libopus.a ../ && cp include/opus*.h ../)
 
 libs-$(ARCH)/libspeex.a:
 	test -f speex-$(SPEEXVER).tar.gz || wget http://downloads.us.xiph.org/releases/speex/speex-$(SPEEXVER).tar.gz
-	-test -f libs-$(ARCH)/libspeex.a || (mkdir -p libs-$(ARCH)/speex && cd libs-$(ARCH) && tar -xvzf ../speex-$(SPEEXVER).tar.gz && cd speex-$(SPEEXVER) && CFLAGS="$(CFLAGS) -Os" $(TOOLOVERRIDES) ./configure $(CONFIGARGS) && $(TOOLOVERRIDES) $(MAKE) && cp libspeex/.libs/libspeex.a ../ && cp -r include/speex/*.h ../speex/)
+	test -f libs-$(ARCH)/libspeex.a || (mkdir -p libs-$(ARCH)/speex && cd libs-$(ARCH) && tar -xvzf ../speex-$(SPEEXVER).tar.gz && cd speex-$(SPEEXVER) && CFLAGS="$(CFLAGS) -Os" $(TOOLCONFIGUREOVERRIDES) ./configure $(CONFIGARGS) --disable-binaries && $(TOOLMAKEOVERRIDES) $(MAKE) && cp libspeex/.libs/libspeex.a ../ && cp -r include/speex/*.h ../speex/)
 
 libs-$(ARCH)/libspeexdsp.a:
 	test -f speexdsp-$(SPEEXDSPVER).tar.gz || wget http://downloads.xiph.org/releases/speex/speexdsp-$(SPEEXDSPVER).tar.gz
-	-test -f libs-$(ARCH)/libspeexdsp.a || (mkdir -p libs-$(ARCH)/speex && cd libs-$(ARCH) && tar -xvzf ../speexdsp-$(SPEEXDSPVER).tar.gz && cd speexdsp-$(SPEEXDSPVER) && CFLAGS="$(CFLAGS) -Os" $(TOOLOVERRIDES) ./configure $(CONFIGARGS) && $(TOOLOVERRIDES) $(MAKE) && cp libspeexdsp/.libs/libspeexdsp.a ../ && cp -r include/speex/*.h ../speex/)
+	test -f libs-$(ARCH)/libspeexdsp.a || (mkdir -p libs-$(ARCH)/speex && cd libs-$(ARCH) && tar -xvzf ../speexdsp-$(SPEEXDSPVER).tar.gz && cd speexdsp-$(SPEEXDSPVER) && CFLAGS="$(CFLAGS) -Os" $(TOOLCONFIGUREOVERRIDES) ./configure $(CONFIGARGS) && $(TOOLMAKEOVERRIDES) $(MAKE) && cp libspeexdsp/.libs/libspeexdsp.a ../ && cp -r include/speex/*.h ../speex/)
 
 libs-$(ARCH)/libfreetype.a libs-$(ARCH)/ft2build.h: libs-$(ARCH)/libpng.a libs-$(ARCH)/libpng.pc
 	test -f freetype-$(FREETYPEVER).tar.gz || wget https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$(FREETYPEVER).tar.gz
-	-test -f libs-$(ARCH)/libfreetype.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../freetype-$(FREETYPEVER).tar.gz && cd freetype-$(FREETYPEVER) && PKG_CONFIG_LIBDIR=$(NATIVE_ABSBASE_DIR)/libs-$(ARCH) CFLAGS="$(CFLAGS) -Os" $(TOOLOVERRIDES) ./configure CPPFLAGS=-I$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ LDFLAGS=-L$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ $(CONFIGARGS) --with-zlib=yes --with-png=yes --with-bzip2=no --with-harfbuzz=no && $(TOOLOVERRIDES) $(MAKE) && cp objs/.libs/libfreetype.a ../ && cp -r include/* ../)
+	test -f libs-$(ARCH)/libfreetype.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../freetype-$(FREETYPEVER).tar.gz && cd freetype-$(FREETYPEVER) && PKG_CONFIG_LIBDIR=$(NATIVE_ABSBASE_DIR)/libs-$(ARCH) CFLAGS="$(CFLAGS) -Os" $(TOOLOVERRIDES) ./configure CPPFLAGS=-I$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ LDFLAGS=-L$(NATIVE_ABSBASE_DIR)/libs-$(ARCH)/ $(CONFIGARGS) --with-zlib=yes --with-png=yes --with-bzip2=no --with-harfbuzz=no && $(TOOLOVERRIDES) $(MAKE) && cp objs/.libs/libfreetype.a ../ && cp -r include/* ../)
 
 libs-$(ARCH)/libBulletDynamics.a:
 	test -f bullet3-$(BULLETVER).tar.gz || wget https://github.com/bulletphysics/bullet3/archive/$(BULLETVER).tar.gz -O bullet3-$(BULLETVER).tar.gz
-	-test -f libs-$(ARCH)/libBulletDynamics.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../bullet3-$(BULLETVER).tar.gz && cd bullet3-$(BULLETVER) && CFLAGS="$(CFLAGS) -Os" $(TOOLOVERRIDES) $(DO_CMAKE) . && $(TOOLOVERRIDES) $(MAKE) LinearMath BulletDynamics BulletCollision && cp src/LinearMath/libLinearMath.a src/BulletDynamics/libBulletDynamics.a src/BulletCollision/libBulletCollision.a src/btBulletCollisionCommon.h src/btBulletDynamicsCommon.h ..)
+	test -f libs-$(ARCH)/libBulletDynamics.a || (mkdir -p libs-$(ARCH) && cd libs-$(ARCH) && tar -xvzf ../bullet3-$(BULLETVER).tar.gz && cd bullet3-$(BULLETVER) && CFLAGS="$(CFLAGS) -Os" $(TOOLOVERRIDES) $(DO_CMAKE) . && $(TOOLOVERRIDES) $(MAKE) LinearMath BulletDynamics BulletCollision && cp src/LinearMath/libLinearMath.a src/BulletDynamics/libBulletDynamics.a src/BulletCollision/libBulletCollision.a src/btBulletCollisionCommon.h src/btBulletDynamicsCommon.h ..)
 
 libs-$(ARCH)/vulkan/vulkan.h:
 	test -f vulkan-sdk-$(VULKANVER).tar.gz || wget https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/vulkan-sdk-$(VULKANVER).tar.gz  
@@ -2380,13 +2437,13 @@ $(RELEASE_DIR)/imgtool$(BITS)$(EXEPOSTFIX): $(IMGTOOL_OBJECTS)
 imgtool-rel: $(RELEASE_DIR)/imgtool$(BITS)$(EXEPOSTFIX)
 imgtool: imgtool-rel
 
-MASTER_OBJECTS=server/sv_sys_unix.c common/sys_linux_threads.c common/net_ssl_gnutls.c server/sv_master.c common/net_wins.c common/net_ice.c common/cvar.c common/cmd.c common/sha1.c http/httpclient.c common/log.c common/fs.c common/fs_stdio.c common/common.c common/translate.c common/zone.c qclib/hash.c
+MASTER_OBJECTS=server/sv_sys_unix.c common/sys_linux_threads.c common/net_ssl_gnutls.c server/sv_master.c common/net_wins.c common/net_ice.c common/cvar.c common/cmd.c common/sha1.c common/sha2.c http/httpclient.c common/log.c common/fs.c common/fs_stdio.c common/common.c common/translate.c common/zone.c qclib/hash.c
 $(RELEASE_DIR)/ftemaster$(BITS)$(EXEPOSTFIX): $(MASTER_OBJECTS)
 	$(CC) -o $@ $(MASTER_OBJECTS) -flto=jobserver -fvisibility=hidden -Icommon -Iclient -Iqclib -Igl -Iserver -DMASTERONLY -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -lm -ldl -lz $(RELEASE_CFLAGS) $(RELEASE_LDFLAGS)
 $(DEBUG_DIR)/ftemaster$(BITS)$(EXEPOSTFIX): $(MASTER_OBJECTS)
 	$(CC) -o $@ $(MASTER_OBJECTS) -Icommon -Iclient -Iqclib -Igl -Iserver -DMASTERONLY -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -lm -ldl -lz $(DEBUG_CFLAGS) $(DEBUG_LDFLAGS)
-master-rel: $(RELEASE_DIR)/ftemaster$(BITS)$(EXEPOSTFIX)
-master-dbg: $(DEBUG_DIR)/ftemaster$(BITS)$(EXEPOSTFIX)
+master-rel: reldir $(RELEASE_DIR)/ftemaster$(BITS)$(EXEPOSTFIX)
+master-dbg: dbgdir $(DEBUG_DIR)/ftemaster$(BITS)$(EXEPOSTFIX)
 master: master-rel
 
 QTV_OBJECTS=	\
diff --git a/engine/client/cl_cam.c b/engine/client/cl_cam.c
index e6e489458..d2a13c898 100644
--- a/engine/client/cl_cam.c
+++ b/engine/client/cl_cam.c
@@ -68,7 +68,7 @@ void Cam_AutoTrack_Update(const char *mode)
 	autotrack_statsrule = NULL;
 	if (!*mode || !Q_strcasecmp(mode, "auto"))
 	{
-		if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+		if (cls.demoplayback == DPB_MVD)
 		{
 			autotrackmode = TM_STATS;
 			autotrack_statsrule = Z_StrDup("");	//default
@@ -501,7 +501,7 @@ static int CL_AutoTrack_Choose(int seat)
 		best = cl.autotrack_killer;
 	if (autotrackmode == TM_MODHINTS && seat == 0 && cl.autotrack_hint >= 0)
 		best = cl.autotrack_hint;
-	if (autotrackmode == TM_STATS && (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV))
+	if (autotrackmode == TM_STATS && cls.demoplayback == DPB_MVD)
 		best = CL_FindHighTrack(seat, autotrack_statsrule);
 	if (autotrackmode == TM_HIGHTRACK || best == -1)
 		best = CL_FindHighTrack(seat, "%f");
@@ -578,7 +578,7 @@ void Cam_Lock(playerview_t *pv, int playernum)
 	
 	Skin_FlushPlayers();
 
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 	{
 		memcpy(&pv->stats, cl.players[playernum].stats, sizeof(pv->stats));
 //		pv->cam_state = CAM_;
@@ -1001,13 +1001,13 @@ void Cam_FinishMove(playerview_t *pv, usercmd_t *cmd)
 	if (cls.state != ca_active)
 		return;
 
-	if (!pv->spectator && (cls.demoplayback != DPB_MVD && cls.demoplayback != DPB_EZTV)) // only in spectator mode
+	if (!pv->spectator && cls.demoplayback != DPB_MVD) // only in spectator mode
 		return;
 
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 	{
-		int nb;
-		nb = (cmd->sidemove<0)?4:0;
+		int nb = 0;
+		nb |= (cmd->sidemove<0)?4:0;
 		nb |= (cmd->sidemove>0)?8:0;
 		nb |= (cmd->forwardmove<0)?16:0;
 		nb |= (cmd->forwardmove>0)?32:0;
@@ -1015,18 +1015,21 @@ void Cam_FinishMove(playerview_t *pv, usercmd_t *cmd)
 		nb |= (cmd->upmove>0)?128:0;
 		if (Cam_TrackNum(pv) >= 0)
 		{
-			if (nb & (nb ^ pv->cam_oldbuttons) & 4)
-				Cvar_SetValue(&cl_demospeed, max(cl_demospeed.value - 0.1, 0));
-			if (nb & (nb ^ pv->cam_oldbuttons) & 8)
-				Cvar_SetValue(&cl_demospeed, min(cl_demospeed.value + 0.1, 10));
-			if (nb & (nb ^ pv->cam_oldbuttons) & (4|8))
-				Con_Printf("playback speed: %g%%\n", cl_demospeed.value*100);
-			if (nb & (nb ^ pv->cam_oldbuttons) & 16)
-				Cbuf_AddText("demo_jump +10", RESTRICT_LOCAL);
-			if (nb & (nb ^ pv->cam_oldbuttons) & 32)
-				Cbuf_AddText("demo_jump -10", RESTRICT_LOCAL);
-			if (nb & (nb ^ pv->cam_oldbuttons) & (4|8))
-				Con_Printf("playback speed: %g%%\n", cl_demospeed.value*100);
+			if (*cls.lastdemoname)
+			{	//changing rates or jumping doesn't make sense with mvds.
+				if (nb & (nb ^ pv->cam_oldbuttons) & 4)
+					Cvar_SetValue(&cl_demospeed, max(cl_demospeed.value - 0.1, 0));
+				if (nb & (nb ^ pv->cam_oldbuttons) & 8)
+					Cvar_SetValue(&cl_demospeed, min(cl_demospeed.value + 0.1, 10));
+				if (nb & (nb ^ pv->cam_oldbuttons) & (4|8))
+					Con_Printf("playback speed: %g%%\n", cl_demospeed.value*100);
+				if (nb & (nb ^ pv->cam_oldbuttons) & 16)
+					Cbuf_AddText("demo_jump +10", RESTRICT_LOCAL);
+				if (nb & (nb ^ pv->cam_oldbuttons) & 32)
+					Cbuf_AddText("demo_jump -10", RESTRICT_LOCAL);
+				if (nb & (nb ^ pv->cam_oldbuttons) & (4|8))
+					Con_Printf("playback speed: %g%%\n", cl_demospeed.value*100);
+			}
 			if (nb & (nb ^ pv->cam_oldbuttons) & 64)
 				Cvar_SetValue(&cl_splitscreen, max(cl_splitscreen.ival - 1, 0));
 			if (nb & (nb ^ pv->cam_oldbuttons) & 128)
diff --git a/engine/client/cl_demo.c b/engine/client/cl_demo.c
index d64ca4dc7..93e1dda6f 100644
--- a/engine/client/cl_demo.c
+++ b/engine/client/cl_demo.c
@@ -78,6 +78,7 @@ void CL_StopPlayback (void)
 	cls.demoplayback = DPB_NONE;
 	cls.demoseeking = false;	//just in case
 	cls.demotrack = -1;
+	cls.demoeztv_ext = 0;
 
 	if (cls.timedemo)
 		CL_FinishTimeDemo ();
@@ -215,7 +216,7 @@ int demo_preparsedemo(unsigned char *buffer, int bytes)
 	int ofs;
 	unsigned int length;
 #define dem_mask 7
-	if (cls.demoplayback != DPB_MVD && cls.demoplayback != DPB_EZTV)
+	if (cls.demoplayback != DPB_MVD)
 		return bytes;	//no need if its not an mvd (this simplifies it a little)
 
 	while (bytes>2)
@@ -407,6 +408,12 @@ void CL_DemoJump_f(void)
 		return;
 	}
 
+	if (!*cls.lastdemoname)
+	{
+		Con_Printf("unable to seak in qtv streams.\n");
+		return;	//can't seek live streams...
+	}
+
 	if (*s == '+' || *s == '-')
 	{
 		if (colon)
@@ -465,6 +472,12 @@ void CL_DemoNudge_f(void)
 		return;
 	}
 
+	if (!*cls.lastdemoname)
+	{
+		Con_Printf("unable to seak in qtv streams.\n");
+		return;	//can't seek live streams...
+	}
+
 	if (!move)
 		move = 1;
 
@@ -519,6 +532,7 @@ qboolean CL_GetDemoMessage (void)
 	q1usercmd_t q1cmd;
 	int demopos = 0;
 	int msglength;
+	static float throttle;
 
 	if (endofdemo)
 	{
@@ -667,7 +681,7 @@ readnext:
 	}
 
 	// read the time from the packet
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 	{
 		if (demtime < 0)
 		{
@@ -681,7 +695,9 @@ readnext:
 
 		if (readdemobytes(&demopos, &msecsadded, sizeof(msecsadded)) != sizeof(msecsadded))
 		{
-			Con_DPrintf("Not enough buffered\n");
+			Con_ThrottlePrintf(&throttle, 1, "Not enough buffered\n");
+			olddemotime = demtime+1;
+
 			demotime = olddemotime;
 			nextdemotime = demotime;
 			return 0;
@@ -696,7 +712,7 @@ readnext:
 	{
 		if (readdemobytes(&demopos, &demotime, sizeof(demotime)) != sizeof(demotime))
 		{
-			Con_DPrintf("Not enough buffered\n");
+			Con_ThrottlePrintf(&throttle, 1, "Not enough buffered\n");
 			olddemotime = demtime;	//if we ran out of buffered demo, delay the demo parsing a little
 			return 0;
 		}
@@ -763,15 +779,10 @@ readnext:
 	else
 		demtime = demotime; // we're warping
 
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 	{
 		if ((msecsadded || cls.netchan.incoming_sequence < 2) && olddemotime != demotime)
 		{
-			if (!(cls.fteprotocolextensions2 & PEXT2_REPLACEMENTDELTAS))
-			{
-				cls.netchan.incoming_sequence++;
-				cls.netchan.incoming_acknowledged++;
-			}
 			cls.netchan.frame_latency = 0;
 			cls.netchan.last_received = realtime; // just to happy timeout check
 		}
@@ -783,7 +794,7 @@ readnext:
 	// get the msg type
 	if (readdemobytes (&demopos, &c, sizeof(c)) != sizeof(c))
 	{
-		Con_DPrintf("Not enough buffered\n");
+		Con_ThrottlePrintf(&throttle, 1, "Not enough buffered\n");
 		olddemotime = demtime+1;
 		return 0;
 	}
@@ -805,7 +816,7 @@ readnext:
 			r = readdemobytes (&demopos, &q1cmd, sizeof(q1cmd));
 			if (r != sizeof(q1cmd))
 			{
-				Con_DPrintf("Not enough buffered\n");
+				Con_ThrottlePrintf(&throttle, 1, "Not enough buffered\n");
 				olddemotime = demtime+1;
 				CL_StopPlayback ();
 				return 0;
@@ -843,7 +854,7 @@ readit:
 		// get the next message
 		if (readdemobytes (&demopos, &msglength, 4) != 4)
 		{
-			Con_DPrintf("Not enough buffered\n");
+			Con_ThrottlePrintf(&throttle, 1, "Not enough buffered\n");
 			olddemotime = demtime+1;
 			return 0;
 		}
@@ -857,20 +868,27 @@ readit:
 		}
 		if (readdemobytes (&demopos, net_message.data, msglength) != msglength)
 		{
-			Con_DPrintf("Not enough buffered\n");
+			Con_ThrottlePrintf(&throttle, 1, "Not enough buffered\n");
 			olddemotime = demtime+1;
 			return 0;
 		}
 		NET_UpdateRates(cls.sockets, true, msglength);	//keep any rate calcs sane
 		net_message.cursize = msglength;
 
-		if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+		if (cls.demoplayback == DPB_MVD)
 		{
 			int seat;
 			cl.defaultnetsplit = 0;
 			switch(cls_lasttype)
 			{
 			case dem_multiple:
+				if (!cls_lastto && (cls.ezprotocolextensions1 & EZPEXT1_HIDDEN_MESSAGES))
+				{	//an 'mvdsv hidden message' packet.
+					MSG_BeginReading(&net_message, cls.netchan.netprim);
+					CLEZ_ParseHiddenDemoMessage();
+					olddemotime = demotime;
+					goto readnext;
+				}
 				for (seat = 0; seat < cl.splitclients; seat++)
 				{
 					tracknum = cl.playerview[seat].cam_spec_track;
@@ -939,7 +957,7 @@ readit:
 
 		NET_UpdateRates(cls.sockets, false, demopos);	//keep any rate calcs sane
 
-		if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+		if (cls.demoplayback == DPB_MVD)
 			cls.netchan.incoming_acknowledged = cls.netchan.incoming_sequence;
 		goto readnext;
 
@@ -975,8 +993,21 @@ readit:
 	}
 	demo_flushbytes(demopos);
 
-	olddemotime = demotime;
+	if (cls.demoplayback == DPB_MVD)
+	{
+		if ((msecsadded || cls.netchan.incoming_sequence < 2) && olddemotime != demotime)
+		{
+			if (!(cls.fteprotocolextensions2 & PEXT2_REPLACEMENTDELTAS))
+			{
+				cls.netchan.incoming_sequence++;
+				cls.netchan.incoming_acknowledged++;
+			}
+			cls.netchan.frame_latency = 0;
+			cls.netchan.last_received = realtime; // just to happy timeout check
+		}
+	}
 
+	olddemotime = demotime;
 	net_from.type = NA_INVALID;
 	return 1;
 }
@@ -1009,6 +1040,7 @@ void CL_Stop_f (void)
 	}
 	else
 #endif
+	if (cls.demorecording == DPB_QUAKEWORLD)
 	{
 		SZ_Clear (&net_message);
 		MSG_WriteLong (&net_message, -1);	// -1 sequence means out of band
@@ -1139,12 +1171,16 @@ void CL_RecordMap_f (void)
 	CL_Disconnect_f();
 
 	SV_SpawnServer (mapname, NULL, false, false, 0);
+	if (!sv.state)
+		return;
 
 #ifdef MVD_RECORDING
-	COM_DefaultExtension(demoname, ".mvd", sizeof(demoname));
-#else
-	COM_DefaultExtension(demoname, ".dem", sizeof(demoname));
+	if (svs.allocated_client_slots > 1)
+		COM_DefaultExtension(demoname, ".mvd", sizeof(demoname));
+	else
 #endif
+		COM_DefaultExtension(demoname, ".qwd", sizeof(demoname));
+
 	COM_FileExtension(demoname, demoext, sizeof(demoext));
 
 #if defined(AVAIL_GZDEC) && !defined(CLIENTONLY)
@@ -1166,6 +1202,19 @@ void CL_RecordMap_f (void)
 	else
 #endif
 	{
+#ifdef NQPROT
+		if (!strcmp(demoext, "dem"))
+			cls.demorecording = DPB_NETQUAKE;
+		else
+#endif
+		if (!strcmp(demoext, "qwd"))
+			cls.demorecording = DPB_QUAKEWORLD;
+		else
+		{
+			CL_Disconnect_f();
+			return;
+		}
+
 		cls.demooutfile = FS_OpenVFS (demoname, "wb", FS_GAME);
 		if (!cls.demooutfile)
 		{
@@ -1176,16 +1225,10 @@ void CL_RecordMap_f (void)
 		if (!Q_strcasecmp(".gz", COM_GetFileExtension(demoname, NULL)))
 			cls.demooutfile = FS_GZ_WriteFilter(cls.demooutfile, true, true);
 #endif
-
 #ifdef NQPROT
-		if (!strcmp(demoext, "dem"))
-		{
-			cls.demorecording = DPB_NETQUAKE;
+		if (cls.demorecording == DPB_NETQUAKE)
 			VFS_PUTS(cls.demooutfile, "-1\n");
-		}
-		else
 #endif
-			cls.demorecording = DPB_QUAKEWORLD;
 		CL_WriteSetDemoMessage();
 	}
 }
@@ -1384,11 +1427,11 @@ void CLNQ_WriteServerData(sizebuf_t *buf)	//for demo recording
 	MSG_WriteByte (buf, cl.deathmatch?GAME_DEATHMATCH:GAME_COOP);
 	MSG_WriteString (buf, cl.levelname);
 
-	for (i = 1; *cl.model_name[i] && i < MAX_PRECACHE_MODELS; i++)
+	for (i = 1; cl.model_name[i] && i < MAX_PRECACHE_MODELS; i++)
 		MSG_WriteString (buf, cl.model_name[i]);
 	MSG_WriteByte (buf, 0);
 
-	for (i = 1; *cl.sound_name[i] && i < MAX_PRECACHE_SOUNDS ; i++)
+	for (i = 1; cl.sound_name[i] && i < MAX_PRECACHE_SOUNDS ; i++)
 		MSG_WriteString (buf, cl.sound_name[i]);
 	MSG_WriteByte (buf, 0);
 }
@@ -2284,7 +2327,7 @@ void CL_PlayDemo_f (void)
 }
 
 //dl is provided so that we can receive files via chunked/gziped http downloads and on systems that don't provide sockets etc. its tracked so we can cancel the download if the client aborts playback early.
-void CL_PlayDemoStream(vfsfile_t *file, char *filename, qboolean issyspath, int demotype, float bufferdelay)
+void CL_PlayDemoStream(vfsfile_t *file, char *filename, qboolean issyspath, int demotype, float bufferdelay, unsigned int eztv_ext)
 {
 	int protocol = CP_UNKNOWN;
 
@@ -2295,7 +2338,6 @@ void CL_PlayDemoStream(vfsfile_t *file, char *filename, qboolean issyspath, int
 
 	switch(demotype)
 	{
-	case DPB_EZTV:
 	case DPB_MVD:
 	case DPB_QUAKEWORLD:
 		protocol = CP_QUAKEWORLD;
@@ -2345,13 +2387,14 @@ void CL_PlayDemoStream(vfsfile_t *file, char *filename, qboolean issyspath, int
 		Con_Printf ("Playing demo from %s.\n", filename);
 	}
 
-	cls.findtrack = (demotype == DPB_MVD || demotype == DPB_EZTV);
+	cls.findtrack = (demotype == DPB_MVD);
 
 	cls.demoplayback = demotype;
+	cls.demoeztv_ext = eztv_ext;
 	cls.protocol = protocol;
 	cls.state = ca_demostart;
 	net_message.packing = SZ_RAWBYTES;
-	Netchan_Setup (NS_CLIENT, &cls.netchan, &net_from, 0);
+	Netchan_Setup (NCF_CLIENT, &cls.netchan, &net_from, 0, 0);
 
 	demtime = -bufferdelay;
 	cls.demostarttime = 0;
@@ -2391,20 +2434,20 @@ void CL_PlayDemoFile(vfsfile_t *f, char *demoname, qboolean issyspath)
 	if (!Q_strcasecmp(demoname + strlen(demoname) - 3, "dm2") ||
 		!Q_strcasecmp(demoname + strlen(demoname) - 6, "dm2.gz"))
 	{
-		CL_PlayDemoStream(f, demoname, issyspath, DPB_QUAKE2, 0);
+		CL_PlayDemoStream(f, demoname, issyspath, DPB_QUAKE2, 0, 0);
 		return;
 	}
 #endif
 	if (!Q_strcasecmp(demoname + strlen(demoname) - 3, "mvd") ||
 		!Q_strcasecmp(demoname + strlen(demoname) - 6, "mvd.gz"))
 	{
-		CL_PlayDemoStream(f, demoname, issyspath, DPB_MVD, 0);
+		CL_PlayDemoStream(f, demoname, issyspath, DPB_MVD, 0, 0);
 		return;
 	}
 	if (!Q_strcasecmp(demoname + strlen(demoname) - 3, "qwd") ||
 		!Q_strcasecmp(demoname + strlen(demoname) - 6, "qwd.gz"))
 	{
-		CL_PlayDemoStream(f, demoname, issyspath, DPB_QUAKEWORLD, 0);
+		CL_PlayDemoStream(f, demoname, issyspath, DPB_QUAKEWORLD, 0, 0);
 		return;
 	}
 
@@ -2436,7 +2479,7 @@ void CL_PlayDemoFile(vfsfile_t *f, char *demoname, qboolean issyspath)
 			else
 				cls.demotrack = -1;
 
-			CL_PlayDemoStream(f, demoname, issyspath, DPB_NETQUAKE, 0);
+			CL_PlayDemoStream(f, demoname, issyspath, DPB_NETQUAKE, 0, 0);
 			return;
 		}
 		VFS_SEEK(f, start);
@@ -2477,7 +2520,7 @@ void CL_PlayDemoFile(vfsfile_t *f, char *demoname, qboolean issyspath)
 				if (protocol >= PROTOCOL_VERSION_Q2_DEMO_MIN && protocol <= PROTOCOL_VERSION_Q2_DEMO_MAX)
 				{
 					VFS_SEEK(f, start);
-					CL_PlayDemoStream(f, demoname, issyspath, DPB_QUAKE2, 0);
+					CL_PlayDemoStream(f, demoname, issyspath, DPB_QUAKE2, 0, 0);
 					return;
 				}
 				break;
@@ -2493,7 +2536,7 @@ void CL_PlayDemoFile(vfsfile_t *f, char *demoname, qboolean issyspath)
 	//could also be .qwz or .dmz or whatever that nq extension is. we don't support either.
 
 	//mvd and qwd have no identifying markers, other than the extension.
-	CL_PlayDemoStream(f, demoname, issyspath, DPB_QUAKEWORLD, 0);
+	CL_PlayDemoStream(f, demoname, issyspath, DPB_QUAKEWORLD, 0, 0);
 }
 #ifdef WEBCLIENT
 void CL_PlayDownloadedDemo(struct dl_download *dl)
@@ -2566,7 +2609,7 @@ void CL_Demo_ClientCommand(char *commandtext)
 #ifdef warningmsg
 #pragma warningmsg("this needs buffering safely")
 #endif
-	if (cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD && cls.demoeztv_ext)
 	{
 		VFS_WRITE(cls.demoinfile, &len, sizeof(len));
 		VFS_WRITE(cls.demoinfile, &b, sizeof(b));
@@ -2947,8 +2990,9 @@ fail:
 				//eztv extensions to v1.0
 				else if (!strcmp(s, "QTV_EZQUAKE_EXT"))
 				{
-					iseztv = true;
-					Con_Printf("Warning: eztv extensions %s\n", colon);
+					iseztv = atoi(colon);
+					if (iseztv & ~(EZTV_DOWNLOAD|EZTV_SETINFO|EZTV_QTVUSERLIST))
+						Con_Printf(CON_WARNING"Warning: unknown eztv extensions %s\n", colon);
 				}
 
 				//v1.1 sourcelist response includes SRCSRV, SRCHOST, SRCPLYRS, SRCVIEWS, SRCID
@@ -3013,7 +3057,7 @@ fail:
 				Con_Printf("streaming \"%s\" from qtv\n", streamavailable);
 			else
 				Con_Printf("qtv connection established to %s\n", qtv->hostname);
-			CL_PlayDemoStream(qtv->stream, NULL, false, iseztv?DPB_EZTV:DPB_MVD, BUFFERTIME);
+			CL_PlayDemoStream(qtv->stream, NULL, false, DPB_MVD, BUFFERTIME, iseztv);
 			qtv->stream = NULL;
 			demo_resetcache(qtv->requestsize - (tail-qtv->requestbuffer), tail);
 			*link = qtv->next;
@@ -3194,8 +3238,8 @@ void CL_QTVPlay_f (void)
 		if (qtvcl_eztvextensions.ival)
 		{
 			Q_snprintfz(msg+msglen, sizeof(msg)-msglen,
-					"QTV_EZQUAKE_EXT: 3\n"
-					"USERINFO: ");
+					"QTV_EZQUAKE_EXT: %u\n"
+					"USERINFO: ", EZTV_DOWNLOAD|EZTV_SETINFO|EZTV_QTVUSERLIST);
 			msglen += strlen(msg+msglen);
 			InfoBuf_ToString(&cls.userinfo[0], msg+msglen, sizeof(msg)-msglen-1, basicuserinfos, NULL, NULL, NULL, NULL);
 			msglen += strlen(msg+msglen);
diff --git a/engine/client/cl_ents.c b/engine/client/cl_ents.c
index c8afc989a..9e41d87d8 100644
--- a/engine/client/cl_ents.c
+++ b/engine/client/cl_ents.c
@@ -925,7 +925,7 @@ void CLFTE_ReadDelta(unsigned int entnum, entity_state_t *news, entity_state_t *
 	if (bits & UF_DRAWFLAGS)
 	{
 		news->hexen2flags = MSG_ReadByte();
-		if ((news->hexen2flags & MLS_MASK) == MLS_ABSLIGHT)
+		if ((news->hexen2flags & MLS_MASK) >= MLS_ADDLIGHT)
 			news->abslight = MSG_ReadByte();
 		else
 			news->abslight = 0;
@@ -1052,7 +1052,7 @@ void CLFTE_ParseEntities(void)
 //		Con_Printf("CL: Dropped %i\n", i);
 //	}
 
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 	{
 		cls.netchan.incoming_sequence++;
 		cls.netchan.incoming_acknowledged++;
@@ -1291,7 +1291,7 @@ void CLQW_ParsePacketEntities (qboolean delta)
 	cl.inframes[newpacket].frameid = cls.netchan.incoming_sequence;
 	cl.inframes[newpacket].receivedtime = realtime;
 
-	if (cls.protocol == CP_QUAKEWORLD && (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV))
+	if (cls.protocol == CP_QUAKEWORLD && cls.demoplayback == DPB_MVD)
 	{
 		extern float olddemotime;	//time from the most recent demo packet
 		cl.oldgametime = cl.gametime;
@@ -1317,7 +1317,7 @@ void CLQW_ParsePacketEntities (qboolean delta)
 		from = MSG_ReadByte ();
 
 //		Con_Printf("%i %i from %i\n", cls.netchan.outgoing_sequence, cls.netchan.incoming_sequence, from);
-		if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+		if (cls.demoplayback == DPB_MVD)
 			from = oldpacket = cls.netchan.incoming_sequence - 1;
 		oldpacket = cl.inframes[from & UPDATE_MASK].frameid;
 
@@ -1851,6 +1851,209 @@ void CLDP_ParseDarkPlaces5Entities(void)	//the things I do.. :o(
 	}
 }
 
+#ifdef HEXEN2
+#define UH2_MOREBITS	(1u<<0)
+#define UH2_ORIGIN1		(1u<<1)
+#define UH2_ORIGIN2		(1u<<2)
+#define UH2_ORIGIN3		(1u<<3)
+#define UH2_ANGLE2		(1u<<4)
+#define UH2_STEP		(1u<<5)
+#define UH2_FRAME		(1u<<6)
+#define UH2_SIGNAL		(1u<<7)
+
+#define UH2_ANGLE1		(1u<<8)
+#define UH2_ANGLE3		(1u<<9)
+#define UH2_MODEL		(1u<<10)
+//#define UH2_			(1u<<11)
+//#define UH2_			(1u<<12)
+//#define UH2_			(1u<<13)
+#define UH2_LONGENTITY	(1u<<14)
+#define UH2_EVENMORE	(1u<<15)
+
+#define UH2_SKIN		(1u<<16)
+#define UH2_EFFECTS		(1u<<17)
+#define UH2_SCALE		(1u<<18)
+#define UH2_COLORMAP	(1u<<19)
+
+void CLH2_ParseEntities(void)
+{
+	//h2mp apparently uses some sort of delta compression
+	//there's three parts to this, the start, the updates, and the removes at the end.
+	//so we can be a bit lazy and parse the 'fast updates' here and assert they end with a final clear.
+	//entities are ordered.
+
+	packet_entities_t	*oldpack, *newpack;
+
+	entity_state_t		*to, *from;
+	unsigned int read, bits;
+	int oldi;
+	unsigned int removecount;
+
+	int frame = MSG_ReadByte();
+	int seq = MSG_ReadByte();
+
+	//not really sure what to do with this.
+	(void)frame;
+	(void)seq;
+
+	//server->client sequence
+//	if (cl.numackframes == sizeof(cl.ackframes)/sizeof(cl.ackframes[0]))
+//		cl.numackframes--;
+//	cl.ackframes[cl.numackframes++] = MSG_ReadLong(); /*server sequence to be acked*/
+
+	//client->server sequence ack
+//	if (cls.protocol_nq >= CPNQ_DP7)
+//		CL_AckedInputFrame(cls.netchan.incoming_sequence, MSG_ReadLong(), true); /*client input sequence which has been acked*/
+
+	if (cl.validsequence)
+		oldpack = &cl.inframes[(cl.validsequence)&UPDATE_MASK].packet_entities;
+	else
+		oldpack = NULL;
+	cl.validsequence = cls.netchan.incoming_sequence;
+	cl.inframes[(cls.netchan.incoming_sequence)&UPDATE_MASK].receivedtime = realtime;
+	cl.inframes[(cls.netchan.incoming_sequence)&UPDATE_MASK].frameid = cls.netchan.incoming_sequence;
+	newpack = &cl.inframes[(cls.netchan.incoming_sequence)&UPDATE_MASK].packet_entities;
+	newpack->servertime = cl.gametime;
+
+	//copy old state to new state
+	if (newpack != oldpack)
+	{
+		if (oldpack)
+		{
+			newpack->num_entities = oldpack->num_entities;
+			newpack->max_entities = newpack->num_entities+16;	//for slop for new ents, to reduce reallocs
+			newpack->entities = BZ_Realloc(newpack->entities, sizeof(entity_state_t)*newpack->max_entities);
+			memcpy(newpack->entities, oldpack->entities, sizeof(entity_state_t)*newpack->num_entities);
+		}
+		else
+			newpack->num_entities = 0;
+		newpack->bonedatacur = 0;
+
+		//flag them all as having old bones
+		//they'll be renewed after parsing
+		for (oldi=0 ; oldi<newpack->num_entities ; oldi++)
+			newpack->entities[oldi].boneoffset |= 0x80000000;
+	}
+
+	for (;;)
+	{
+		bits = MSG_ReadByte();
+		if ((bits&0x80) == 0)
+			break;	//no fast-update bit!
+		if (bits & UH2_MOREBITS)
+			bits |= MSG_ReadByte()<<8;
+		if (bits & UH2_EVENMORE)
+			bits |= MSG_ReadByte()<<16;
+		if (bits & UH2_LONGENTITY)
+			read = MSG_ReadUInt16();
+		else
+			read = MSG_ReadByte();
+
+		if (msg_badread)
+			Host_EndGame("Corrupt entity message packet\n");
+
+		if (!read)
+			break;	//remove world signals end of packet.
+
+		if (read >= MAX_EDICTS)
+			Host_EndGame("Too many entities.\n");
+
+		if (!CL_CheckBaselines(read))
+			Host_EndGame("CLNQ_ParseEntity: check baselines failed with size %i", read);
+		from = &cl_baselines[read];
+		to = NULL;
+
+		for (oldi=0 ; oldi<newpack->num_entities ; oldi++)
+		{
+			if (read == newpack->entities[oldi].number)
+			{
+				from = &newpack->entities[oldi];
+				to = &newpack->entities[oldi];
+				break;
+			}
+		}
+
+		if (!to)
+		{	//okay, so this is new
+			if (newpack->num_entities==newpack->max_entities)
+			{
+				newpack->max_entities = newpack->num_entities+16;
+				newpack->entities = BZ_Realloc(newpack->entities, sizeof(entity_state_t)*newpack->max_entities);
+			}
+
+			to = &newpack->entities[newpack->num_entities];
+			newpack->num_entities++;
+
+			if (cl_shownet.ival >= 3)
+				Con_Printf("%3i:     New %i %x\n", MSG_GetReadCount(), to->number, bits);
+		}
+		else if (cl_shownet.ival >= 3)
+			Con_Printf("%3i:     Update %i %x\n", MSG_GetReadCount(), to->number, bits);
+
+		memcpy(to, from, sizeof(*to));
+		to->number = read;
+
+		if (bits & UH2_MODEL)	to->modelindex = MSG_ReadShort();
+		if (bits & UH2_FRAME)	to->frame = MSG_ReadByte();
+		if (bits & UH2_COLORMAP)to->colormap = MSG_ReadByte();
+		if (bits & UH2_SKIN)	to->skinnum = MSG_ReadByte();
+		if (bits & UH2_SKIN)	to->hexen2flags = MSG_ReadByte();	//yes, shared with skin
+		if (bits & UH2_EFFECTS)	to->effects = MSG_ReadByte();
+		if (bits & UH2_ORIGIN1)	to->origin[0] = MSG_ReadCoord();
+		if (bits & UH2_ANGLE1)	to->angles[0] = MSG_ReadAngle();
+		if (bits & UH2_ORIGIN2)	to->origin[1] = MSG_ReadCoord();
+		if (bits & UH2_ANGLE2)	to->angles[1] = MSG_ReadAngle();
+		if (bits & UH2_ORIGIN3)	to->origin[2] = MSG_ReadCoord();
+		if (bits & UH2_ANGLE3)	to->angles[2] = MSG_ReadAngle();
+		if (bits & UH2_SCALE)	to->scale = MSG_ReadByte()*(16.0/100);
+		if (bits & UH2_SCALE)	to->abslight = MSG_ReadByte();
+
+		to->sequence = cls.netchan.incoming_sequence;
+		to->inactiveflag = 0;
+	}
+
+	//handle the removes
+	if (bits != 48)
+		Host_EndGame("Corrupt entity message packet\n");
+	removecount = (qbyte)MSG_ReadByte();
+	while (removecount --> 0)
+	{
+		read = MSG_ReadUInt16();
+		for (oldi=0 ; oldi<newpack->num_entities ; oldi++)
+		{
+			if (read == newpack->entities[oldi].number)
+			{
+				newpack->entities[oldi].inactiveflag = true;
+				break;
+			}
+		}
+	}
+
+	//sort them, just in case. the removes will bubble to the end.
+	qsort(newpack->entities, newpack->num_entities, sizeof(entity_state_t), CLDP_SortEntities);
+	while (newpack->num_entities)
+	{	//pop those removes.
+		if (newpack->entities[newpack->num_entities-1].inactiveflag)
+			newpack->num_entities--;
+		else
+			break;
+	}
+
+
+	//make sure any bone states are refreshed
+	for (oldi=0, to = newpack->entities; oldi<newpack->num_entities ; oldi++, to++)
+	{
+		if (to->bonecount && (to->boneoffset & 0x80000000))
+		{
+			unsigned int oldoffset = to->boneoffset & 0x7fffffff;
+			void *dest = AllocateBoneSpace(newpack, to->bonecount, &to->boneoffset);
+			void *src = GetBoneSpace(oldpack, oldoffset);
+			memcpy(dest, src, to->bonecount * sizeof(short)*7);
+		}
+	}
+}
+#endif
+
 void CLNQ_ParseEntity(unsigned int bits)
 {
 	int i;
@@ -3934,7 +4137,7 @@ static qboolean CL_ChooseInterpolationFrames(int *newf, int *oldf, float servert
 qboolean CL_MayLerp(void)
 {
 	//force lerping when playing low-framerate demos.
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 		return true;
 #ifdef NQPROT
 	if (cls.demoplayback == DPB_NETQUAKE)
@@ -3956,13 +4159,13 @@ void CL_TransitionEntities (void)
 	qboolean nolerp;
 	float servertime, frac;
 
-	if (cls.protocol == CP_QUAKEWORLD && (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV))
+	if (cls.protocol == CP_QUAKEWORLD && cls.demoplayback == DPB_MVD)
 	{
 		nolerp = false;
 	}
 	else
 	{
-		nolerp = !CL_MayLerp() && cls.demoplayback != DPB_MVD && cls.demoplayback != DPB_EZTV;
+		nolerp = !CL_MayLerp() && cls.demoplayback != DPB_MVD;
 	}
 
 	if (cl.demonudge < 0)
@@ -4825,8 +5028,26 @@ void CLQW_ParsePlayerinfo (void)
 	oldstate = &cl.inframes[oldparsecountmod].playerstate[num];
 	state = &cl.inframes[parsecountmod].playerstate[num];
 
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 	{
+#ifdef QUAKESTATS
+		int i;
+		const char *viewmodel = NULL;
+		static struct {
+			const char *vmdl;
+			const char *vwep;
+		} haxx[] =
+		{
+			{"progs/v_axe.mdl",		"w_axe"},
+			{"progs/v_shot.mdl",	"w_shot"},
+			{"progs/v_shot2.mdl",	"w_shot2"},
+			{"progs/v_nail.mdl",	"w_nail"},
+			{"progs/v_nail2.mdl",	"w_nail2"},
+			{"progs/v_rock.mdl",	"w_rock"},
+			{"progs/v_rock2.mdl",	"w_rock2"},
+			{"progs/v_light.mdl",	"w_light"},
+		};
+#endif
 		player_state_t	dummy;
 		if (!cl.parsecount || info->prevcount > cl.parsecount || cl.parsecount - info->prevcount >= UPDATE_BACKUP - 1)
 		{
@@ -4853,11 +5074,38 @@ void CLQW_ParsePlayerinfo (void)
 
 		state->messagenum = cl.parsecount;
 		state->command.msec = 0;
+		state->command.impulse = 0;
+
+#ifdef QUAKESTATS
+		i = cl.players[num].stats[STAT_WEAPONMODELI];
+		if (i>0&&i<MAX_PRECACHE_MODELS && cl.model_name_vwep[0])
+			viewmodel = cl.model_name[i];
+		if(viewmodel)
+		{
+			for (i = 0; i < countof(haxx); i++)
+			{
+				if (!strcmp(viewmodel, haxx[i].vmdl))
+				{
+					viewmodel = haxx[i].vwep;
+					for (i = 1; i < countof(cl.model_name_vwep); i++)
+					{
+						if (!cl.model_name_vwep[i])
+							break;
+						if (!strcmp(viewmodel, cl.model_name_vwep[i]))
+						{
+							state->command.impulse = i;
+							break;
+						}
+					}
+					break;
+				}
+			}
+		}
+#endif
 
 		state->frame = MSG_ReadByte ();
 
 		state->state_time = parsecounttime;
-		state->command.msec = 0;
 
 		for (i = 0; i < 3; i++)
 		{
@@ -5365,7 +5613,7 @@ void CL_LinkPlayers (void)
 	frame = &cl.inframes[displayseq&UPDATE_MASK];
 
 	predictplayers = cl_predict_players.ival;
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 		predictplayers = false;
 
 	for (j=0, info=cl.players, state=frame->playerstate ; j < cl.allocated_client_slots
diff --git a/engine/client/cl_input.c b/engine/client/cl_input.c
index ae5672137..49617fb81 100644
--- a/engine/client/cl_input.c
+++ b/engine/client/cl_input.c
@@ -1332,6 +1332,8 @@ void CL_AdjustAngles (int pnum, double frametime)
 		if (!cl_instantrotate.ival)
 			quant *= speed*frametime;
 		in_rotate -= quant;
+		if (r_xflip.ival)
+			quant *= -1;
 		if (ruleset_allow_frj.ival)
 			cl.playerview[pnum].viewanglechange[YAW] += quant;
 	}
@@ -1342,6 +1344,8 @@ void CL_AdjustAngles (int pnum, double frametime)
 		if ((cl.fpd & FPD_LIMIT_YAW) || !ruleset_allow_frj.ival)
 			quant = bound(-900, quant, 900);
 		quant *= frametime;
+		if (r_xflip.ival)
+			quant *= -1;
 		cl.playerview[pnum].viewanglechange[YAW] -= quant * CL_KeyState (&in_right, pnum, false);
 		cl.playerview[pnum].viewanglechange[YAW] += quant * CL_KeyState (&in_left, pnum, false);
 	}
@@ -1410,6 +1414,9 @@ static void CL_BaseMove (vec3_t moves, int pnum)
 	if ((in_speed.state[pnum] & 1) ^ cl_run.ival)
 		scale *= cl_movespeedkey.value;
 
+	if (r_xflip.ival)
+		sidespeed *= -1;
+
 	moves[0] = 0;
 	if (! (in_klook.state[pnum] & 1) )
 	{
@@ -1819,7 +1826,7 @@ static qboolean CLFTE_SendVRCmd (sizebuf_t *buf, unsigned int seats)
 	if (flags & VRM_LOSS)
 		MSG_WriteByte (buf, (qbyte)lost);
 	if (flags & VRM_DELAY)
-		MSG_WriteByte (buf, bound(0,cldelay,255));	//a byte should always be enough for any framerate above 40.
+		MSG_WriteByte (buf, bound(0,cldelay,255));	//a byte should always be enough for any framerate above 40, and we don't want peole to be able to lie so easily.
 	if (flags & VRM_ACKS)
 	{
 		MSG_WriteUInt64(buf, cl.numackframes);
@@ -2122,7 +2129,7 @@ void VARGS CL_SendSeatClientCommand(qboolean reliable, unsigned int seat, char *
 	char		string[2048];
 	clcmdbuf_t *buf, *prev;
 
-	if (cls.demoplayback && cls.demoplayback != DPB_EZTV)
+	if (cls.demoplayback && !(cls.demoplayback == DPB_MVD && cls.demoeztv_ext))
 		return;	//no point.
 
 	va_start (argptr, format);
@@ -2783,7 +2790,7 @@ void CL_SendCmd (double frametime, qboolean mainloop)
 	if (cls.demoplayback != DPB_NONE || cls.state <= ca_demostart)
 	{
 		cursor_active = false;
-		if (!cls.state || cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+		if (!cls.state || cls.demoplayback == DPB_MVD)
 		{
 			extern cvar_t cl_splitscreen;
 			cl.ackedmovesequence = cl.movesequence;
diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index 22bdd3e50..ab6f2231b 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -73,7 +73,8 @@ cvar_t	cl_nolerp	= CVARD("cl_nolerp", "0", "Disables interpolation. If set, miss
 cvar_t	cl_nolerp_netquake = CVARD("cl_nolerp_netquake", "0", "Disables interpolation when connected to an NQ server. Does affect players, even the local player. You probably don't want to set this.");
 static cvar_t	cl_fullpitch_nq = CVARAFD("cl_fullpitch", "0", "pq_fullpitch", CVAR_SEMICHEAT, "When set, attempts to unlimit the default view pitch. Note that some servers will screw over your angles if you use this, resulting in terrible gameplay, while some may merely clamp your angle serverside. This is also considered a cheat in quakeworld, ^1so this will not function there^7. For the equivelent in quakeworld, use serverinfo minpitch+maxpitch instead, which applies to all players fairly.");
 #endif
-static cvar_t	cl_forcevrui = CVARD("cl_forcevrui", "0", "Force the use of VR UIs, even with no VR headset active.");
+static cvar_t	cl_vrui_force = CVARD("cl_vrui_force", "0", "Force the use of VR UIs, even with no VR headset active.");
+cvar_t	cl_vrui_lock = CVARD("cl_vrui_lock", "1", "Controls how the UI is positioned when using VR/XR. 0: Repositioned infront of the head when the console/menus are toggled. 1: Locked infront of the reference position (which may require the user to turn around to find it).");
 cvar_t	*hud_tracking_show;
 cvar_t	*hud_miniscores_show;
 extern cvar_t net_compress;
@@ -119,14 +120,18 @@ cvar_t	cl_noblink = CVARD("cl_noblink", "0", "Disable the ^^b text blinking feat
 cvar_t	cl_servername = CVARFD("cl_servername", "", CVAR_NOSET, "The hostname of the last server you connected to");
 cvar_t	cl_serveraddress = CVARD("cl_serveraddress", "none", "The address of the last server you connected to");
 cvar_t	qtvcl_forceversion1 = CVAR("qtvcl_forceversion1", "0");
-cvar_t	qtvcl_eztvextensions = CVAR("qtvcl_eztvextensions", "0");
+cvar_t	qtvcl_eztvextensions = CVAR("qtvcl_eztvextensions", "1");
 
 cvar_t	record_flush = CVARD("record_flush", "0", "If set, explicitly flushes demo data to disk while recording. This may be inefficient, depending on how your operating system is configured.");
 cvar_t cl_demospeed = CVARF("cl_demospeed", "1", 0);
 cvar_t	cl_demoreel = CVARFD("cl_demoreel", "0", CVAR_SAVE, "When enabled, the engine will begin playing a demo loop on startup.");
 
 cvar_t cl_loopbackprotocol = CVARD("cl_loopbackprotocol", "qw", "Which protocol to use for single-player/the internal client. Should be one of: qw, qwid, nqid, nq, fitz, bjp3, dp6, dp7, auto. If 'auto', will use qw protocols for qw mods, and nq protocols for nq mods.");
+#ifdef FTE_TARGET_WEB
+static cvar_t cl_verify_urischeme = CVARAFD("cl_verify_urischeme", "2", "cl_verify_qwprotocol"/*ezquake, inappropriate for misc schemes*/, CVAR_NOSAVE/*checked at startup, so its only really default.cfg that sets it*/, "0: Do nothing.\n1: Check whether our protocol scheme is registered and prompt the user to register associations.\n2: Always re-register on every startup, without prompting. Sledgehammer style.");
+#else
 static cvar_t cl_verify_urischeme = CVARAFD("cl_verify_urischeme", "0", "cl_verify_qwprotocol"/*ezquake, inappropriate for misc schemes*/, CVAR_NOSAVE/*checked at startup, so its only really default.cfg that sets it*/, "0: Do nothing.\n1: Check whether our protocol scheme is registered and prompt the user to register associations.\n2: Always re-register on every startup, without prompting. Sledgehammer style.");
+#endif
 
 
 cvar_t	cl_threadedphysics = CVARD("cl_threadedphysics", "0", "When set, client input frames are generated and sent on a worker thread");
@@ -192,7 +197,6 @@ cvar_t	cl_sendguid				= CVARD("cl_sendguid", "", "Send a randomly generated 'glo
 cvar_t	cl_downloads			= CVARAFD("cl_downloads", "1", /*q3*/"cl_allowDownload", CVAR_NOTFROMSERVER|CVAR_ARCHIVE, "Allows you to block all automatic downloads.");
 cvar_t	cl_download_csprogs		= CVARFD("cl_download_csprogs", "1", CVAR_NOTFROMSERVER|CVAR_ARCHIVE, "Download updated client gamecode if available. Warning: If you clear this to avoid downloading vm code, you should also clear cl_download_packages.");
 cvar_t	cl_download_redirection	= CVARFD("cl_download_redirection", "2", CVAR_NOTFROMSERVER|CVAR_ARCHIVE, "Follow download redirection to download packages instead of individual files. Also allows the server to send nearly arbitary download commands.\n2: allows redirection only to named packages files (and demos/*.mvd), which is a bit safer.");
-cvar_t  cl_download_mapsrc		= CVARFD("cl_download_mapsrc", "", CVAR_ARCHIVE, "Specifies an http location prefix for map downloads. EG: \"http://example.com/path/gamemaps/\"");
 cvar_t	cl_download_packages	= CVARFD("cl_download_packages", "1", CVAR_NOTFROMSERVER, "0=Do not download packages simply because the server is using them. 1=Download and load packages as needed (does not affect games which do not use this package). 2=Do download and install permanently (use with caution!)");
 cvar_t	requiredownloads		= CVARAFD("cl_download_wait", "1", /*old*/"requiredownloads", CVAR_ARCHIVE, "0=join the game before downloads have even finished (might be laggy). 1=wait for all downloads to complete before joining.");
 cvar_t	mod_precache			= CVARD("mod_precache","1", "Controls when models are loaded.\n0: Load them only when they're actually needed.\n1: Load them upfront.\n2: Lazily load them to shorten load times at the risk of brief stuttering during only the start of the map.");
@@ -302,7 +306,7 @@ static struct
 	} ext;
 	int					qport;
 	int					challenge;		//tracked as part of guesswork based upon what replies we get.
-	int					clchallenge;
+	int					clchallenge;	//generated by the client, to ensure the response wasn't spoofed/spammed.
 	double				time;			//for connection retransmits
 	qboolean			clogged;		//ignore time...
 	enum coninfomode_e
@@ -361,7 +365,10 @@ void VRUI_SnapAngle(void)
 {
 //	VectorCopy(cl.playerview[0].viewangles, vrui.angles);
 	vrui.angles[0] = 0;
-	vrui.angles[1] = cl.playerview[0].aimangles[1];
+	if (cl_vrui_lock.ival)	//if its locked, then its locked infront of the unpitched player entity
+		vrui.angles[1] = cl.playerview[0].viewangles[1];
+	else	//otherwise its moved to infront of the player's head any time the menu is displayed.
+		vrui.angles[1] = cl.playerview[0].aimangles[1];
 	vrui.angles[2] = 0;
 }
 
@@ -796,6 +803,8 @@ static void CL_SendConnectPacket (netadr_t *to)
 		//cl.splitclients = 1;
 		if (q3)
 			q3->cl.SendConnectPacket(cls.sockets, to, connectinfo.challenge, connectinfo.qport, cls.userinfo);
+		else
+			CL_ConnectAbort("Q3 plugin not loaded, cannot connect to q3 servers without it.\n");
 		return;
 	}
 #endif
@@ -926,7 +935,7 @@ char *CL_TryingToConnect(void)
 	return cls.servername;
 }
 
-#ifdef NQPROT
+#if defined(NQPROT) && defined(HAVE_SERVER)
 static void CL_NullReadPacket(void)
 {	//just drop it all
 }
@@ -942,9 +951,7 @@ struct resolvectx_s
 };
 static void CL_ResolvedServer(void *vctx, void *data, size_t a, size_t b)
 {
-#ifdef HAVE_DTLS
 	size_t i;
-#endif
 	struct resolvectx_s *ctx = vctx;
 
 	//something screwed us over...
@@ -971,7 +978,7 @@ static void CL_ResolvedServer(void *vctx, void *data, size_t a, size_t b)
 	if (connectinfo.mode == CIM_Q2EONLY)
 	{
 		for (i = 0; i < ctx->found; i++)
-		{	//if we've already established a dtls connection, stick with it
+		{	//if we've already established a dtls connection, stick with it, otherwise 'upgrade' from udp to 'kexlan' transport layer.
 			if (ctx->adr[i].prot == NP_DGRAM)
 				ctx->adr[i].prot = NP_KEXLAN;
 		}
@@ -986,8 +993,12 @@ static void CL_ResolvedServer(void *vctx, void *data, size_t a, size_t b)
 static void CL_ResolveServer(void *vctx, void *data, size_t a, size_t b)
 {
 	struct resolvectx_s *ctx = vctx;
+
+	//stupid logic for targ@prox2@prox1 chaining. just disable it if there's weird ws:// or whatever in there.
+	//FIXME: really shouldn't be in there
+	const char *res = strrchr(ctx->servername, '/');
 	const char *host = strrchr(ctx->servername+1, '@');
-	if (host)
+	if (host && !res)
 		host++;
 	else
 		host = ctx->servername;
@@ -1464,8 +1475,10 @@ void CL_CheckForResend (void)
 	if (contype & 1)
 	{
 		char tmp[256];
-		//vanilla: Q_snprintfz (data, sizeof(data), "%c%c%c%cgetchallenge\n", 255, 255, 255, 255);
-		Q_snprintfz (data, sizeof(data), "%c%c%c%cgetchallenge %i %s\n", 255, 255, 255, 255, connectinfo.clchallenge, COM_QuotedString(com_protocolname.string, tmp, sizeof(tmp), false));
+		if (strrchr(cls.servername, '@'))	//if we're apparently using qwfwd then strictly adhere to vanilla's protocol so that qwfwd does not bug out. this will pollute gamedirs if stuff starts autodownloading from the wrong type of server, and probably show up vanilla-vs-rerelease glitches everywhere..
+			Q_snprintfz (data, sizeof(data), "%c%c%c%cgetchallenge\n", 255, 255, 255, 255);
+		else
+			Q_snprintfz (data, sizeof(data), "%c%c%c%cgetchallenge %i %s\n", 255, 255, 255, 255, connectinfo.clchallenge, COM_QuotedString(com_protocolname.string, tmp, sizeof(tmp), false));
 		switch(NET_SendPacket (cls.sockets, strlen(data), data, to))
 		{
 		case NETERR_CLOGGED:	//temporary failure
@@ -1511,7 +1524,7 @@ void CL_CheckForResend (void)
 				if (*e)
 					pwd = CalcHashInt(&hash_md4, password.string, strlen(password.string));
 			}
-			MSG_WriteByte(&sb, 1); /*'mod'*/
+			MSG_WriteByte(&sb, MOD_PROQUAKE); /*'mod'*/
 			MSG_WriteByte(&sb, 34); /*'mod' version*/
 			MSG_WriteByte(&sb, 0); /*flags*/
 			MSG_WriteLong(&sb, pwd); /*password*/
@@ -1584,9 +1597,9 @@ static void CL_BeginServerConnect(char *host, int port, qboolean noproxy, enum c
 
 		//the scheme is either a network scheme in which case we use it directly, or a game-specific scheme.
 		scheme = NET_IsURIScheme(schemestart);
-		if (scheme->prot == NP_INVALID)
+		if (scheme && scheme->prot == NP_INVALID)
 			scheme = NULL;	//qw:// or q3:// something that's just noise here.
-		if (scheme->flags&URISCHEME_NEEDSRESOURCE)
+		if (scheme && scheme->flags&URISCHEME_NEEDSRESOURCE)
 		{
 			Q_strncpyz (cls.servername, schemestart, sizeof(cls.servername));	//oh. will probably be okay then
 			arglist = NULL;
@@ -1612,6 +1625,13 @@ static void CL_BeginServerConnect(char *host, int port, qboolean noproxy, enum c
 						Con_Printf("Ignoring 'join'\n");
 					memmove(sl, sl+5, strlen(sl+5)+1);
 				}
+				else if (!strncmp(sl, "/qtvplay", 5))
+				{
+					char buf[256];
+					*sl = 0;
+					Cmd_ExecuteString(va("qtvplay %s\n", COM_QuotedString(schemeend+3, buf,sizeof(buf), false)), RESTRICT_LOCAL);
+					return;
+				}
 				else if (!strncmp(sl, "/", 1) && (sl[1] == 0 || sl[1]=='?'))
 				{
 					//current spectator mode
@@ -1649,6 +1669,7 @@ static void CL_BeginServerConnect(char *host, int port, qboolean noproxy, enum c
 	connectinfo.protocol = CP_UNKNOWN;
 	connectinfo.mode = mode;
 	connectinfo.spec = spec;
+	connectinfo.clchallenge = rand()^(rand()<<16);
 
 	connectinfo.peercred.name = cls.servername;
 	if (arglist)
@@ -1716,6 +1737,7 @@ void CL_BeginServerReconnect(void)
 	connectinfo.time = 0;
 	connectinfo.tries = 0;	//re-ensure routes.
 	connectinfo.nextadr = 0; //should at least be consistent, other than packetloss. yay.
+	connectinfo.clchallenge = rand()^(rand()<<16);
 
 	NET_InitClient(false);
 }
@@ -1785,11 +1807,11 @@ static void CL_Connect_f (void)
 	server = Cmd_Argv (1);
 	server = strcpy(alloca(strlen(server)+1), server);
 
-#ifdef HAVE_SERVER
+/*#ifdef HAVE_SERVER
 	if (sv.state == ss_clustermode)
 		CL_Disconnect (NULL);
 	else
-#endif
+#endif*/
 		CL_Disconnect_f ();
 
 	CL_BeginServerConnect(server, 0, false, CIM_DEFAULT, CIS_DEFAULT);
@@ -1821,11 +1843,11 @@ static void CL_ConnectBestRoute_f (void)
 	else
 		Con_TPrintf ("Routing table favours chaining through %i proxies (%ims vs %ims)\n", proxies, chainedcost, directcost);
 
-#ifdef HAVE_SERVER
+/*#ifdef HAVE_SERVER
 	if (sv.state == ss_clustermode)
 		CL_Disconnect (NULL);
 	else
-#endif
+#endif*/
 		CL_Disconnect_f ();
 	CL_BeginServerConnect(server, 0, true, CIM_DEFAULT, CIS_DEFAULT);
 }
@@ -2265,6 +2287,17 @@ void CL_ClearState (qboolean gamestart)
 			if (cl.particle_csname[i])
 				free(cl.particle_csname[i]);
 	}
+	for (i = 0; i < countof(cl.model_name); i++)
+		if (cl.model_name[i])
+			BZ_Free(cl.model_name[i]);
+#ifdef HAVE_LEGACY
+	for (i = 0; i < countof(cl.model_name_vwep); i++)
+		if (cl.model_name_vwep[i])
+			BZ_Free(cl.model_name_vwep[i]);
+#endif
+	for (i = 0; i < countof(cl.sound_name); i++)
+		if (cl.sound_name[i])
+			BZ_Free(cl.sound_name[i]);
 #ifdef Q2CLIENT
 	for (i = 0; i < Q2MAX_IMAGES; i++)
 		if (cl.image_name[i])
@@ -2521,6 +2554,13 @@ void CL_Disconnect (const char *reason)
 	cls.findtrack = false;
 	cls.realserverip.type = NA_INVALID;
 
+	while (cls.qtvviewers)
+	{
+		struct qtvviewers_s *v = cls.qtvviewers;
+		cls.qtvviewers = v->next;
+		Z_Free(v);
+	}
+
 #ifdef TCPCONNECT
 	//disconnects it, without disconnecting the others.
 	FTENET_AddToCollection(cls.sockets, "conn", NULL, NA_INVALID, NP_DGRAM);
@@ -2618,6 +2658,7 @@ void CL_Users_f (void)
 {
 	int		i;
 	int		c;
+	struct qtvviewers_s *v;
 
 	c = 0;
 	Con_TPrintf ("userid frags name\n");
@@ -2631,6 +2672,11 @@ void CL_Users_f (void)
 		}
 	}
 
+	for (v = cls.qtvviewers; v; v = v->next)
+	{
+		Con_Printf ("%6s %4s ^[%s^]\n", "", "-", v->name);
+	}
+
 	Con_TPrintf ("%i total users\n", c);
 }
 
@@ -2927,7 +2973,7 @@ void CL_PakDownloads(int mode)
 	mode&4 download even packages that are not referenced.
 	*/
 	char local[256];
-	char *pname;
+	char *pname, *sep;
 	char *s = cl.serverpackhashes;
 	int i;
 
@@ -2946,6 +2992,10 @@ void CL_PakDownloads(int mode)
 		else if (!(mode & 4))
 			continue;
 
+		sep = strchr(pname, '/');
+		if (!sep || strchr(sep+1, '/'))
+			continue;	//don't try downloading weird ones here... paks inside paks is screwy stuff!
+
 		if ((mode&3) != 2)
 		{
 			/*if we already have such a file, this is a no-op*/
@@ -3773,6 +3823,7 @@ void CL_Reconnect_f (void)
 
 static void CL_ConnectionlessPacket_Connection(char *tokens)
 {
+	unsigned int ncflags;
 	int qportsize = -1;
 	if (net_from.type == NA_INVALID)
 		return;	//I've found a qizmo demo that contains one of these. its best left ignored.
@@ -3848,19 +3899,16 @@ static void CL_ConnectionlessPacket_Connection(char *tokens)
 	cls.fteprotocolextensions2 = connectinfo.ext.fte2;
 	cls.ezprotocolextensions1 = connectinfo.ext.ez1;
 	cls.challenge = connectinfo.challenge;
-	Netchan_Setup (NS_CLIENT, &cls.netchan, &net_from, connectinfo.qport);
+	ncflags = NCF_CLIENT;
+	if (connectinfo.ext.mtu)
+		ncflags |= NCF_FRAGABLE;
+	if (connectinfo.ext.fte2&PEXT2_STUNAWARE)
+		ncflags |= NCF_STUNAWARE;
+	Netchan_Setup (ncflags, &cls.netchan, &net_from, connectinfo.qport, connectinfo.ext.mtu);
 	cls.protocol_q2 = (cls.protocol == CP_QUAKE2)?connectinfo.subprotocol:0;
 	if (qportsize>=0)
 		cls.netchan.qportsize = qportsize;
-	cls.netchan.pext_fragmentation = connectinfo.ext.mtu?true:false;
-	cls.netchan.pext_stunaware = !!(connectinfo.ext.fte2&PEXT2_STUNAWARE);
-	if (connectinfo.ext.mtu >= 64)
-	{
-		cls.netchan.mtu = connectinfo.ext.mtu;
-		cls.netchan.message.maxsize = sizeof(cls.netchan.message_buf);
-	}
-	else
-		cls.netchan.mtu = MAX_QWMSGLEN;
+
 #ifdef HUFFNETWORK
 	cls.netchan.compresstable = Huff_CompressionCRC(connectinfo.ext.compresscrc);
 #else
@@ -4069,7 +4117,7 @@ void CL_ConnectionlessPacket (void)
 
 		if (!strcmp(com_token, "hallengeResponse"))
 		{
-			/*Quake3*/
+			/*Quake3 - "\xff\xff\xff\xffchallengeResponse challenge [clchallenge protover]" (no \n)*/
 #ifdef Q3CLIENT
 			if (connectinfo.protocol == CP_QUAKE3 || connectinfo.protocol == CP_UNKNOWN)
 			{
@@ -4262,12 +4310,12 @@ void CL_ConnectionlessPacket (void)
 #ifdef HAVE_DTLS
 		if ((candtls && net_enable_dtls.ival) && net_from.prot == NP_DGRAM && (net_enable_dtls.ival>1 || candtls > 1) && !NET_IsEncrypted(&net_from))
 		{
-			//c2s getchallenge			<no client details
+			//c2s getchallenge			<no client details, only leaks that its quakelike, something you can maybe guess from port numbers>
 			//s2c c%u\0DTLS=$candtls	<may leak server details>
 			//<<YOU ARE HERE>>
 			//c2s dtlsconnect %u [REALTARGET]	<FIXME: target server is plain text, not entirely unlike tls1.2, but still worse than a vpn and could be improved>
 			//s2c dtlsopened			<no details at all, other than that the server is now willing to accept dtls handshakes etc>
-			//c2s DTLS(getchallenge)
+			//c2s DTLS(getchallenge)	<start here if you're using dtls:// scheme>
 			//DTLS(etc)
 
 			//NOTE: the dtlsconnect/dtlsopened parts are redundant and the non-dtls parts are now entirely optional (and should be skipped if the client requries/knows the server supports dtls)
@@ -4284,7 +4332,7 @@ void CL_ConnectionlessPacket (void)
 				char *pkt;
 				//qwfwd proxy routing. it doesn't support it yet, but hey, if its willing to forward the dtls packets its all good.
 				char *at;
-				if ((at = strrchr(cls.servername, '@')))
+				if ((at = strrchr(cls.servername, '@')) && !strchr(cls.servername, '/'))
 				{
 					*at = 0;
 					pkt = va("%c%c%c%c""dtlsconnect %i %s", 255, 255, 255, 255, connectinfo.challenge, cls.servername);
@@ -4391,7 +4439,7 @@ void CL_ConnectionlessPacket (void)
 			}
 
 			Validation_Apply_Ruleset();
-			Netchan_Setup(NS_CLIENT, &cls.netchan, &net_from, connectinfo.qport);
+			Netchan_Setup(NCF_CLIENT, &cls.netchan, &net_from, connectinfo.qport, 0);
 			CL_ParseEstablished();
 
 			cls.netchan.isnqprotocol = true;
@@ -4674,7 +4722,7 @@ void CLNQ_ConnectionlessPacket(void)
 		cls.fteprotocolextensions = connectinfo.ext.fte1;
 		cls.fteprotocolextensions2 = connectinfo.ext.fte2;
 		cls.ezprotocolextensions1 = connectinfo.ext.ez1;
-		Netchan_Setup (NS_CLIENT, &cls.netchan, &net_from, connectinfo.qport);
+		Netchan_Setup (NCF_CLIENT, &cls.netchan, &net_from, connectinfo.qport, 0);
 		CL_ParseEstablished();
 		cls.netchan.isnqprotocol = true;
 		cls.netchan.compresstable = NULL;
@@ -4767,7 +4815,7 @@ void CL_ReadPacket(void)
 		return;	//ignore it. We arn't connected.
 	}
 
-	if (net_message.cursize < 6 && (cls.demoplayback != DPB_MVD && cls.demoplayback != DPB_EZTV)) //MVDs don't have the whole sequence header thing going on
+	if (net_message.cursize < 6 && cls.demoplayback != DPB_MVD) //MVDs don't have the whole sequence header thing going on
 	{
 		char adr[MAX_ADR_SIZE];
 		if (net_message.cursize == 1 && net_message.data[0] == A2A_ACK)
@@ -4791,7 +4839,7 @@ void CL_ReadPacket(void)
 		return;
 	}
 
-	if (cls.netchan.pext_stunaware)	//should be safe to do this here.
+	if (cls.netchan.flags&NCF_STUNAWARE)	//should be safe to do this here.
 		if (NET_WasSpecialPacket(cls.sockets))
 			return;
 
@@ -4836,7 +4884,7 @@ void CL_ReadPacket(void)
 #endif
 		break;
 	case CP_QUAKEWORLD:
-		if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+		if (cls.demoplayback == DPB_MVD)
 		{
 			MSG_BeginReading(&net_message, cls.netchan.netprim);
 			cls.netchan.last_received = realtime;
@@ -4891,7 +4939,7 @@ void CL_ReadPackets (void)
 		}
 	}
 
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 	{
 		CL_MVDUpdateSpectator();
 	}
@@ -4908,7 +4956,7 @@ qboolean CL_AllowArbitaryDownload(const char *oldname, const char *localfile)
 		strstr(localfile, "\\") || strstr(localfile, "..") || strstr(localfile, "./") || strstr(localfile, ":") || strstr(localfile, "//") ||	//certain path patterns are just bad
 		Q_strcasestr(localfile, ".qvm") || Q_strcasestr(localfile, ".dll") || Q_strcasestr(localfile, ".so") || Q_strcasestr(localfile, ".dylib"))	//disallow any native code
 	{	//yes, I know the user can use a different progs from the one that is specified. If you leave it blank there will be no problem. (server isn't allowed to stuff progs cvar)
-		Con_Printf("Ignoring arbitary download to \"%s\" due to possible security risk\n", localfile);
+		Con_Printf("Ignoring arbitrary download to \"%s\" due to possible security risk\n", localfile);
 		return false;
 	}
 	allow = cl_download_redirection.ival;
@@ -4941,10 +4989,12 @@ static void CL_Curl_f(void)
 	int i, argc = Cmd_Argc();
 	const char *arg, *gamedir, *localterse/*no dlcache*/= NULL;
 	char localname[MAX_QPATH];
+	char localnametmp[MAX_QPATH];
 	int usage = 0;
 	qboolean alreadyhave = false;
 	extern char *cl_dp_packagenames;
 	unsigned int dlflags = DLLF_VERBOSE|DLLF_ALLOWWEB;
+	const char *ext;
 	if (argc < 2)
 	{
 		Con_Printf("%s: No args\n", Cmd_Argv(0));
@@ -5015,12 +5065,29 @@ static void CL_Curl_f(void)
 	}
 	arg = Cmd_Argv(argc-1);
 	if (!localterse)
+	{
+		char *t;
+		localterse = strrchr(arg, '/');
+		if (!localterse)
+			localterse = arg;
+		t = strchr(localterse, '?');
+		if (t)
+			*t = 0;
+		if (t-localterse < countof(localnametmp))
+		{
+			memcpy(localnametmp, localterse, t-localterse);
+			localnametmp[t-localterse] = 0;
+			localterse = localnametmp;
+		}
+	}
+	if (!localterse)
 	{
 		//for compat, we should look for the last / and truncate on a ?.
 		Con_Printf("%s: skipping download of %s, as the local name was not explicitly given\n", Cmd_Argv(0), arg);
 		return;
 	}
-	if (usage == 1)
+	ext = COM_GetFileExtension(localterse, NULL);
+	if (usage == 1 && (!strcmp(ext, ".pk3") || !strcmp(ext, ".pak")))
 	{
 		dlflags |= DLLF_NONGAME;
 		gamedir = FS_GetGamedir(true);
@@ -5084,7 +5151,7 @@ void CL_Download_f (void)
 	if (!*localname)
 		localname = url;
 
-	if ((cls.state == ca_disconnected || cls.demoplayback) && cls.demoplayback != DPB_EZTV)
+	if ((cls.state == ca_disconnected || cls.demoplayback) && !(cls.demoplayback == DPB_MVD && (cls.demoeztv_ext&EZTV_DOWNLOAD)))
 	{
 		Con_TPrintf ("Must be connected.\n");
 		return;
@@ -5134,14 +5201,14 @@ void CL_DownloadSize_f(void)
 	size = Cmd_Argv(2);
 	if (!strcmp(size, "e"))
 	{
-		Con_Printf("Download of \"%s\" failed. Not found.\n", rname);
+		Con_Printf(CON_ERROR"Download of \"%s\" failed. Not found.\n", rname);
 		CL_DownloadFailed(rname, NULL, DLFAIL_SERVERFILE);
 	}
 	else if (!strcmp(size, "p"))
 	{
 		if (cls.download && stricmp(cls.download->remotename, rname))
 		{
-			Con_Printf("Download of \"%s\" failed. Not allowed.\n", rname);
+			Con_Printf(CON_ERROR"Download of \"%s\" failed. Not allowed.\n", rname);
 			CL_DownloadFailed(rname, NULL, DLFAIL_SERVERCVAR);
 		}
 	}
@@ -5359,21 +5426,11 @@ void CL_Fog_f(void)
 #ifdef _DEBUG
 void CL_FreeSpace_f(void)
 {
+	char buf[32];
 	quint64_t freespace;
 	const char *freepath = Cmd_Argv(1);
 	if (Sys_GetFreeDiskSpace(freepath, &freespace))
-	{
-		if (freespace > 512.0*1024*1024*1024)
-			Con_Printf("%s: %g tb available\n", freepath, freespace/(1024.0*1024*1024*1024));
-		else if (freespace > 512.0*1024*1024)
-			Con_Printf("%s: %g gb available\n", freepath, freespace/(1024.0*1024*1024));
-		else if (freespace > 512.0*1024)
-			Con_Printf("%s: %g mb available\n", freepath, freespace/(1024.0*1024));
-		else if (freespace > 512.0)
-			Con_Printf("%s: %g kb available\n", freepath, freespace/1024.0);
-		else
-			Con_Printf("%s: %"PRIu64" bytes available\n", freepath, freespace);
-	}
+		Con_Printf("%s: %s available\n", freepath, FS_AbbreviateSize(buf,sizeof(buf),freespace));
 	else
 		Con_Printf("%s: disk free not queryable\n", freepath);
 }
@@ -5434,7 +5491,24 @@ void CL_Status_f(void)
 
 	if (cls.state)
 	{
+		char cert[8192];
+		qbyte fp[DIGEST_MAXSIZE+1];
+		char b64[(DIGEST_MAXSIZE*4)/3+1];
+		if (NET_GetConnectionCertificate(cls.sockets, &cls.netchan.remote_address, QCERT_ISENCRYPTED, NULL, 0))
+			Q_strncpyz(b64, "<UNENCRYPTED>", sizeof(b64));
+		else
+		{
+			int sz = NET_GetConnectionCertificate(cls.sockets, &cls.netchan.remote_address, QCERT_PEERCERTIFICATE, cert, sizeof(cert));
+			if (sz<0)
+				Q_strncpyz(b64, "<UNAVAILABLE>", sizeof(b64));
+			else
+			{
+				sz = Base64_EncodeBlockURI(fp, CalcHash(&hash_certfp, fp,sizeof(fp), cert, sz), b64, sizeof(b64));
+				b64[sz] = 0;
+			}
+		}
 		Con_Printf("Server address   : %s\n", NET_AdrToString(adr, sizeof(adr), &cls.netchan.remote_address));	//not relevent as a limit.
+		Con_Printf("Server cert fp   : %s\n", b64);	//not relevent as a limit.
 		switch(cls.protocol)
 		{
 		default:
@@ -5466,6 +5540,9 @@ void CL_Status_f(void)
 			case CPNQ_BJP3:
 				Con_Printf("Network Protocol : BJP3\n");
 				break;
+			case CPNQ_H2MP:
+				Con_Printf("Network Protocol : H2MP\n");
+				break;
 			case CPNQ_FITZ666:
 				Con_Printf("Network Protocol : FitzQuake\n");
 				break;
@@ -5555,10 +5632,10 @@ void CL_Status_f(void)
 			count++;
 		}
 		Con_Printf("csqc entities    : %i/%i/%i (mem: %.1f%%)\n", count, csqc_world.num_edicts, csqc_world.max_edicts, 100*(float)(csqc_world.progs->stringtablesize/(double)csqc_world.progs->stringtablemaxsize));
-		for (count = 1; count < MAX_PRECACHE_MODELS; count++)
+		for (count = 1; count < MAX_CSMODELS; count++)
 			if (!*cl.model_csqcname[count])
 				break;
-		Con_Printf("csqc models      : %i/%i\n", count, MAX_PRECACHE_MODELS);
+		Con_Printf("csqc models      : %i/%i\n", count, MAX_CSMODELS);
 		Con_Printf("client sounds    : %i\n", num_sfx);	//there is a limit, its just private. :(
 
 		for (count = 1; count < MAX_SSPARTICLESPRE; count++)
@@ -5678,7 +5755,8 @@ void CL_Init (void)
 	Cvar_Register (&cl_idlefps, cl_screengroup);
 	Cvar_Register (&cl_yieldcpu, cl_screengroup);
 	Cvar_Register (&cl_timeout, cl_controlgroup);
-	Cvar_Register (&cl_forcevrui, cl_controlgroup);
+	Cvar_Register (&cl_vrui_force, cl_controlgroup);
+	Cvar_Register (&cl_vrui_lock, cl_controlgroup);
 	Cvar_Register (&lookspring, cl_inputgroup);
 	Cvar_Register (&lookstrafe, cl_inputgroup);
 	Cvar_Register (&sensitivity, cl_inputgroup);
@@ -5794,7 +5872,6 @@ void CL_Init (void)
 	Cvar_Register (&cl_threadedphysics,				cl_controlgroup);
 	hud_tracking_show = Cvar_Get("hud_tracking_show", "1", 0, "statusbar");
 	hud_miniscores_show = Cvar_Get("hud_miniscores_show", "1", 0, "statusbar");
-	Cvar_Register (&cl_download_mapsrc,				cl_controlgroup);
 
 	Cvar_Register (&cl_dlemptyterminate,				cl_controlgroup);
 
@@ -5863,7 +5940,6 @@ void CL_Init (void)
 	Cmd_AddCommandAD ("connectbr", CL_ConnectBestRoute_f, CL_Connect_c, "connect address:port\nConnect to a qw server using the best route we can detect.");
 #endif
 	Cmd_AddCommandAD("connect", CL_Connect_f, CL_Connect_c, "connect scheme://address:port\nConnect to a server. "
-
 #if defined(FTE_TARGET_WEB)
 		"Use a scheme of rtc[s]://broker/gamename to connect via a webrtc broker."
 		"Use a scheme of ws[s]://server to connect via websockets."
@@ -5896,16 +5972,22 @@ void CL_Init (void)
 	Cmd_AddCommandD ("cl_transfer", CL_Transfer_f, "Connect to a different server, disconnecting from the current server only when the new server replies.");
 #ifdef TCPCONNECT
 	Cmd_AddCommandAD ("connecttcp", CL_TCPConnect_f, CL_Connect_c, "Connect to a server using the tcp:// prefix");
+	Cmd_AddCommandAD ("tcpconnect", CL_TCPConnect_f, CL_Connect_c, "Connect to a server using the tcp:// prefix");
 #endif
 #ifdef IRCCONNECT
 	Cmd_AddCommand ("connectirc", CL_IRCConnect_f);
 #endif
 #ifdef NQPROT
 	Cmd_AddCommandD ("connectnq", CLNQ_Connect_f, "Connects to the specified server, defaulting to port "STRINGIFY(PORT_NQSERVER)". Also disables QW/Q2/Q3/DP handshakes preventing them from being favoured, so should only be used when you actually want NQ protocols specifically.");
+	#ifdef HAVE_DTLS
 	Cmd_AddCommandD ("connectqe", CLNQ_Connect_f, "Connects to the specified server, defaulting to port "STRINGIFY(PORT_NQSERVER)". Also forces the use of DTLS and QE-specific handshakes. You will also need to ensure the dtls_psk_* cvars are set properly or the server will refuse the connection.");
+	#endif
 #endif
 #ifdef Q2CLIENT
-	Cmd_AddCommandD ("connectq2e", CLQ2E_Connect_f, "Connects to the specified server, defaulting to port "STRINGIFY(PORT_Q2ESERVER)".");
+	Cmd_AddCommandD ("connectq2e", CLQ2E_Connect_f, "Connects to the specified server, defaulting to port "STRINGIFY(PORT_Q2EXSERVER)".");
+#endif
+#ifdef HAVE_LEGACY
+	Cmd_AddCommandAD("qwurl", CL_Connect_f, CL_Connect_c, "For compat with ezquake.");
 #endif
 	Cmd_AddCommand ("reconnect", CL_Reconnect_f);
 	Cmd_AddCommandAD ("join", CL_Join_f, CL_Connect_c, "Switches away from spectator mode, optionally connecting to a different server.");
@@ -5924,7 +6006,7 @@ void CL_Init (void)
 
 	Cmd_AddCommandAD ("color", CL_Color_f, CL_Color_c, NULL);
 #if defined(NQPROT) && defined(HAVE_LEGACY)
-	Cmd_AddCommand ("curl",	CL_Curl_f);
+	Cmd_AddCommandD ("curl",	CL_Curl_f, "For use by xonotic.");
 #endif
 	Cmd_AddCommand ("download", CL_Download_f);
 	Cmd_AddCommandD ("dlsize", CL_DownloadSize_f, "For internal use");
@@ -6074,7 +6156,7 @@ void Host_WriteConfiguration (void)
 		f = FS_OpenVFS(savename, "wb", FS_GAMEONLY);
 		if (!f)
 		{
-			FS_NativePath(savename, FS_GAMEONLY, sysname, sizeof(sysname));
+			FS_DisplayPath(savename, FS_GAMEONLY, sysname, sizeof(sysname));
 			Con_TPrintf (CON_ERROR "Couldn't write %s.\n", sysname);
 			return;
 		}
@@ -6084,7 +6166,7 @@ void Host_WriteConfiguration (void)
 
 		VFS_CLOSE (f);
 
-		FS_NativePath(savename, FS_GAMEONLY, sysname, sizeof(sysname));
+		FS_DisplayPath(savename, FS_GAMEONLY, sysname, sizeof(sysname));
 		Con_Printf("Wrote %s\n", savename);
 	}
 }
@@ -6118,15 +6200,6 @@ qboolean Host_SimulationTime(float time)
 }
 #endif
 
-void Host_RunFileNotify(struct dl_download *dl)
-{
-	if (dl->file)
-	{
-		Host_RunFile(dl->url, strlen(dl->url), dl->file);
-		dl->file = NULL;
-	}
-}
-
 #include "fs.h"
 #define HRF_OVERWRITE	(1<<0)
 #define HRF_NOOVERWRITE	(1<<1)
@@ -6136,7 +6209,7 @@ void Host_RunFileNotify(struct dl_download *dl)
 #define HRF_OPENED		(1<<4)
 #define HRF_DOWNLOADED	(1<<5)	//file was actually downloaded, and not from the local system
 #define HRF_WAITING		(1<<6)	//file looks important enough that we should wait for it to start to download or something before we try doing other stuff.
-//						(1<<7)
+#define HRF_DECOMPRESS	(1<<7)	//need to degzip it, which prevents streaming.
 
 #define HRF_DEMO_MVD	(1<<8)
 #define HRF_DEMO_QWD	(1<<9)
@@ -6165,7 +6238,7 @@ typedef struct {
 
 extern int waitingformanifest;
 void Host_DoRunFile(hrf_t *f);
-void CL_PlayDemoStream(vfsfile_t *file, char *filename, qboolean issyspath, int demotype, float bufferdelay);
+void CL_PlayDemoStream(vfsfile_t *file, char *filename, qboolean issyspath, int demotype, float bufferdelay, unsigned int eztv_ext);
 void CL_ParseQTVDescriptor(vfsfile_t *f, const char *name);
 
 //guesses the file type based upon its file extension. mdl/md3/iqm distinctions are not important, so we can usually get away with this in the context of quake.
@@ -6201,13 +6274,13 @@ unsigned int Host_GuessFileType(const char *mimetype, const char *filename)
 		{
 			//demo formats
 			{HRF_DEMO_QWD, "qwd"},
-			{HRF_DEMO_QWD, "qwd.gz"},
+			{HRF_DEMO_QWD|HRF_DECOMPRESS, "qwd.gz"},
 			{HRF_DEMO_MVD, "mvd"},
-			{HRF_DEMO_MVD, "mvd.gz"},
+			{HRF_DEMO_MVD|HRF_DECOMPRESS, "mvd.gz"},
 			{HRF_DEMO_DM2, "dm2"},
-			{HRF_DEMO_DM2, "dm2.gz"},
+			{HRF_DEMO_DM2|HRF_DECOMPRESS, "dm2.gz"},
 			{HRF_DEMO_DEM, "dem"},
-			{HRF_DEMO_DEM, "dem.gz"},
+			{HRF_DEMO_DEM|HRF_DECOMPRESS, "dem.gz"},
 			{HRF_QTVINFO, "qtv"},
 			//other stuff
 			{HRF_MANIFEST, "fmf"},
@@ -6215,6 +6288,7 @@ unsigned int Host_GuessFileType(const char *mimetype, const char *filename)
 			{HRF_BSP, "map"},
 			{HRF_CONFIG, "cfg"},
 			{HRF_CONFIG, "rc"},
+			{HRF_PACKAGE, "kpf"},
 			{HRF_PACKAGE, "pak"},
 			{HRF_PACKAGE, "pk3"},
 			{HRF_PACKAGE, "pk4"},
@@ -6319,20 +6393,29 @@ qboolean Host_BeginFileDownload(struct dl_download *dl, char *mimetype)
 		}
 	}
 
+#ifdef AVAIL_GZDEC
 	//seeking means we can rewind
-	if (f->flags & HRF_DEMO_QWD)
-		CL_PlayDemoStream((dl->file = VFSPIPE_Open(2, true)), f->fname, true, DPB_QUAKEWORLD, 0);
+	if (f->flags & HRF_DECOMPRESS)
+	{	//if its a gzip, we'll probably need to decompress it ourselves... in case the server doesn't use content-encoding:gzip
+		//our demo playback should decompress it when its fin ally available.
+		dl->file = VFSPIPE_Open(1, true);
+		return true;
+	}
+	else
+#endif
+		 if (f->flags & HRF_DEMO_QWD)
+		CL_PlayDemoStream((dl->file = VFSPIPE_Open(2, true)), f->fname, true, DPB_QUAKEWORLD, 0, 0);
 	else if (f->flags & HRF_DEMO_MVD)
-		CL_PlayDemoStream((dl->file = VFSPIPE_Open(2, true)), f->fname, true, DPB_MVD, 0);
+		CL_PlayDemoStream((dl->file = VFSPIPE_Open(2, true)), f->fname, true, DPB_MVD, 0, 0);
 #ifdef Q2CLIENT
 	else if (f->flags & HRF_DEMO_DM2)
-		CL_PlayDemoStream((dl->file = VFSPIPE_Open(2, true)), f->fname, true, DPB_QUAKE2, 0);
+		CL_PlayDemoStream((dl->file = VFSPIPE_Open(2, true)), f->fname, true, DPB_QUAKE2, 0, 0);
 #endif
 #ifdef NQPROT
 	else if (f->flags & HRF_DEMO_DEM)
 	{	//fixme: the demo code can't handle the cd track with streamed/missing-so-far writes.
 		dl->file = VFSPIPE_Open(1, true);	//make sure the reader will be seekable, so we can rewind.
-//		CL_PlayDemoStream((dl->file = VFSPIPE_Open(2, true)), f->fname, DPB_NETQUAKE, 0);
+//		CL_PlayDemoStream((dl->file = VFSPIPE_Open(2, true)), f->fname, DPB_NETQUAKE, 0, 0);
 	}
 #endif
 	else if (f->flags & (HRF_MANIFEST | HRF_QTVINFO))
@@ -6402,6 +6485,7 @@ static qboolean isurl(char *url)
 #endif
 
 qboolean FS_FixupGamedirForExternalFile(char *input, char *filename, size_t fnamelen);
+void CL_PlayDemoFile(vfsfile_t *f, char *demoname, qboolean issyspath);
 
 void Host_DoRunFile(hrf_t *f)
 {
@@ -6466,7 +6550,7 @@ done:
 		//if we still don't know what it is, give up.
 		if (!(f->flags & HRF_FILETYPES))
 		{
-			Con_Printf("Host_DoRunFile: unknown filetype\n");
+			Con_Printf("Host_DoRunFile: unknown filetype for \"%s\"\n", f->fname);
 			goto done;
 		}
 
@@ -6485,18 +6569,22 @@ done:
 		if (f->srcfile)
 		{
 			VFS_SEEK(f->srcfile, 0);
+#ifdef AVAIL_GZDEC
+			f->srcfile = FS_DecompressGZip(f->srcfile, NULL);
+#endif
+
 			if (f->flags & HRF_DEMO_QWD)
-				CL_PlayDemoStream(f->srcfile, f->fname, true, DPB_QUAKEWORLD, 0);
+				CL_PlayDemoStream(f->srcfile, f->fname, true, DPB_QUAKEWORLD, 0, 0);
 #ifdef Q2CLIENT
 			else if (f->flags & HRF_DEMO_DM2)
-				CL_PlayDemoStream(f->srcfile, f->fname, true, DPB_QUAKE2, 0);
+				CL_PlayDemoStream(f->srcfile, f->fname, true, DPB_QUAKE2, 0, 0);
 #endif
 #ifdef NQPROT
 			else if (f->flags & HRF_DEMO_DEM)
-				CL_PlayDemoStream(f->srcfile, f->fname, true, DPB_NETQUAKE, 0);
+				CL_PlayDemoFile(f->srcfile, f->fname, true);	//should be able to handle the cd-track header.
 #endif
 			else //if (f->flags & HRF_DEMO_MVD)
-				CL_PlayDemoStream(f->srcfile, f->fname, true, DPB_MVD, 0);
+				CL_PlayDemoStream(f->srcfile, f->fname, true, DPB_MVD, 0, 0);
 			f->srcfile = NULL;
 		}
 		else
@@ -6657,8 +6745,12 @@ done:
 	if (f->flags & HRF_PACKAGE)
 	{
 #ifdef PACKAGEMANAGER
-		Z_Free(f->packageinfo);
+		if (f->packageinfo)
+			Z_Free(f->packageinfo);	//sucks that we have to do this again, to recompute the proper qname+qroot
+		Q_strncpyz(qname, COM_SkipPath(f->fname), sizeof(qname));
 		f->packageinfo = PM_GeneratePackageFromMeta(f->srcfile, qname,sizeof(qname), &qroot);
+		if (!f->packageinfo)
+			goto done;
 #endif
 	}
 	else if (f->flags & HRF_MANIFEST)
@@ -6718,7 +6810,10 @@ done:
 		}
 		else if (isnew)
 		{
-			Menu_Prompt(Host_RunFilePrompted, f, va(localtext("File appears new.\nWould you like to install\n%s\n"), displayname), "Install!", "", "Cancel", true);
+			if (f->packageinfo && strstr(f->packageinfo, "\nguessed"))
+				Menu_Prompt(Host_RunFilePrompted, f, va(localtext("File appears new.\nWould you like to install\n%s\n"CON_ERROR"File contains no metadata so will be installed to\n%s"), displayname, qname), "Install!", "", "Cancel", true);
+			else
+				Menu_Prompt(Host_RunFilePrompted, f, va(localtext("File appears new.\nWould you like to install\n%s\n"), displayname), "Install!", "", "Cancel", true);
 			return;
 		}
 		else
@@ -6729,9 +6824,9 @@ done:
 	}
 	else if (f->flags & HRF_OVERWRITE)
 	{
-		char buffer[8192];
+		char buffer[65536];
 		int len;
-		f->dstfile = FS_OpenVFS(qname, "wb", qroot);
+		f->dstfile = FS_OpenVFS(qname, (f->flags & HRF_PACKAGE)?"wbp":"wb", qroot);
 		if (f->dstfile)
 		{
 #ifdef FTE_TARGET_WEB
@@ -6753,10 +6848,13 @@ done:
 
 #ifdef PACKAGEMANAGER
 		if (f->flags & HRF_PACKAGE)
-			PM_FileInstalled(COM_SkipPath(f->fname), qroot, f->packageinfo, true);
+			PM_FileInstalled(qname, qroot, f->packageinfo, true);
 #endif
 
-		Cbuf_AddText(loadcommand, RESTRICT_LOCAL);
+		if (!strcmp(loadcommand, "fs_restart\n"))
+			FS_ReloadPackFiles();
+		else
+			Cbuf_AddText(loadcommand, RESTRICT_LOCAL);
 	}
 
 	goto done;
@@ -6779,6 +6877,8 @@ qboolean Host_RunFile(const char *fname, int nlen, vfsfile_t *file)
 		if (!Sys_ResolveFileURL(fname, nlen, utf8, sizeof(utf8)))
 		{
 			Con_Printf("Cannot resolve file url\n");
+			if(file)
+				VFS_CLOSE(file);
 			return false;
 		}
 		fname = utf8;
@@ -6892,7 +6992,11 @@ qboolean Host_RunFile(const char *fname, int nlen, vfsfile_t *file)
 	if (file)
 		f->flags |= HRF_OPENED;
 
-	Con_TPrintf("Opening external file: %s\n", f->fname);
+	{
+		char dpath[MAX_OSPATH];
+		FS_DisplayPath(f->fname, FS_SYSTEM, dpath,sizeof(dpath));
+		Con_TPrintf("Opening external file: %s\n", dpath);
+	}
 
 	Host_DoRunFile(f);
 	return true;
@@ -6924,7 +7028,7 @@ double Host_Frame (double time)
 	qboolean idle;
 	extern int r_blockvidrestart;
 	static qboolean hadwork;
-	qboolean vrsync;
+	unsigned int vrflags;
 	qboolean mustrenderbeforeread;
 
 	RSpeedLocals();
@@ -6934,7 +7038,7 @@ double Host_Frame (double time)
 		return 0;			// something bad happened, or the server disconnected
 	}
 
-	vrsync = vid.vr?vid.vr->SyncFrame(&time):false;				//fiddle with frame timings
+	vrflags = vid.vr?vid.vr->SyncFrame(&time):0;				//fiddle with frame timings
 	newrealtime = Media_TweekCaptureFrameTime(realtime, time);	//fiddle with time some more
 
 	time = newrealtime - realtime;
@@ -6978,7 +7082,7 @@ double Host_Frame (double time)
 	if (!cls.timedemo)
 		CL_ReadPackets ();
 
-	if (idle && cl_idlefps.value > 0 && !vrsync)
+	if (idle && cl_idlefps.value > 0 && !(vrflags&VRF_OVERRIDEFRAMETIME))
 	{
 		double idlesec = 1.0 / cl_idlefps.value;
 		if (idlesec > 0.1)
@@ -7053,7 +7157,7 @@ double Host_Frame (double time)
 #ifdef HAVE_MEDIA_ENCODER
 		&& Media_Capturing() != 2
 #endif
-		&& !vrsync)
+		&& !(vrflags&VRF_OVERRIDEFRAMETIME))
 	{
 		spare = CL_FilterTime((realtime - oldrealtime)*1000, maxfps, 1.5, maxfpsignoreserver);
 		if (!spare)
@@ -7128,7 +7232,7 @@ double Host_Frame (double time)
 
 	CL_UseIndepPhysics(cls.state != ca_disconnected && !!cl_threadedphysics.ival);	//starts/stops the input frame thread.
 
-	cl.do_lerp_players = cl_lerp_players.ival || (cls.demoplayback==DPB_MVD || cls.demoplayback == DPB_EZTV) || (cls.demoplayback && !cl_nolerp.ival && !cls.timedemo);
+	cl.do_lerp_players = cl_lerp_players.ival || cls.demoplayback==DPB_MVD || (cls.demoplayback && !cl_nolerp.ival && !cls.timedemo);
 	CL_AllowIndependantSendCmd(false);
 
 	mustrenderbeforeread = cls.protocol == CP_QUAKE2;	//FIXME: quake2 MUST render a frame (or a later one) before it can read any acks from the server, otherwise its prediction screws up. I'm too lazy to rewrite that right now.
@@ -7213,6 +7317,8 @@ double Host_Frame (double time)
 			Con_Printf("R2D_Flush was set outside of SCR_UpdateScreen\n");
 		}
 
+		cl.mouseplayerview = NULL;
+		cl.mousenewtrackplayer = -1;
 		for (i = 0; i < MAX_SPLITS; i++)
 		{
 			cl.playerview[i].audio.defaulted = true;
@@ -7235,7 +7341,7 @@ double Host_Frame (double time)
 			{
 				RSpeedMark();
 				vid.ime_allow = false;
-				vrui.enabled = cl_forcevrui.ival;
+				vrui.enabled |= cl_vrui_force.ival || (vrflags&VRF_UIACTIVE);
 				if (SCR_UpdateScreen())
 					fps_count++;
 				if (R2D_Flush)
@@ -7350,6 +7456,7 @@ void CL_StartCinematicOrMenu(void)
 		startuppending = true;
 		return;
 	}
+	Cmd_StuffCmds();
 	if (startuppending)
 	{
 		if (startuppending == 2)	//installer finished.
@@ -7379,7 +7486,7 @@ void CL_StartCinematicOrMenu(void)
 	}
 
 	if (!sv_state && !cls.demoinfile && !cls.state && !*cls.servername)
-	{
+	{	//this is so default.cfg can define startup commands to exec if the engine starts up with no +connect / +map etc arg
 		TP_ExecTrigger("f_startup", true);
 		Cbuf_Execute ();
 	}
@@ -7590,6 +7697,7 @@ static void Host_URIPrompt(void *ctx, promptbutton_t btn)
 
 void Host_FinishLoading(void)
 {
+	int i;
 	extern qboolean r_forceheadless;
 	extern int	r_blockvidrestart;
 	if (r_blockvidrestart == true)
@@ -7615,8 +7723,7 @@ void Host_FinishLoading(void)
 
 		Con_History_Load();
 
-		Cmd_StuffCmds();
-		Cbuf_Execute ();
+		r_blockvidrestart = 2;
 
 		CL_ArgumentOverrides();
 	#ifdef HAVE_SERVER
@@ -7641,14 +7748,15 @@ void Host_FinishLoading(void)
 			Sys_Quit();
 	#endif
 
-		r_blockvidrestart = 2;
-
 		Menu_Download_Update();
 
 #ifdef IPLOG
 		IPLog_Merge_File("iplog.txt");
 		IPLog_Merge_File("iplog.dat");	//legacy crap, for compat with proquake
 #endif
+
+		if (!PM_IsApplying())
+			Cmd_StuffCmds();
 	}
 
 	if (PM_IsApplying() == 1)
@@ -7659,6 +7767,16 @@ void Host_FinishLoading(void)
 		return;
 	}
 
+	//open any files specified on the commandline (urls, paks, models, I dunno).
+	for (i = 1; i < com_argc; i++)
+	{
+		if (!com_argv[i])
+			continue;
+		if (*com_argv[i] == '+' || *com_argv[i] == '-')
+			break;
+		Host_RunFile(com_argv[i], strlen(com_argv[i]), NULL);
+	}
+
 	//android may find that it has no renderer at various points.
 	if (r_forceheadless)
 		return;
diff --git a/engine/client/cl_parse.c b/engine/client/cl_parse.c
index e1744260c..e62875a06 100644
--- a/engine/client/cl_parse.c
+++ b/engine/client/cl_parse.c
@@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 void CL_GetNumberedEntityInfo (int num, float *org, float *ang);
 void CLDP_ParseDarkPlaces5Entities(void);
+void CLH2_ParseEntities(void);
 static void CL_SetStatNumeric (int pnum, int stat, int ivalue, float fvalue);
 #define CL_SetStatInt(pnum,stat,ival) do{int thevalue=ival; CL_SetStatNumeric(pnum,stat,thevalue,thevalue);}while(0)
 #define CL_SetStatFloat(pnum,stat,fval) do{float thevalue=fval; CL_SetStatNumeric(pnum,stat,thevalue,thevalue);}while(0)
@@ -35,6 +36,7 @@ static char *CLNQ_ParseProQuakeMessage (char *s);
 #endif
 static void DLC_Poll(qdownload_t *dl);
 static void CL_ProcessUserInfo (int slot, player_info_t *player);
+static void CL_ParseStuffCmd(char *msg, int destsplit);
 static void Con_HexDump(qbyte *packet, size_t len, size_t badoffset);
 
 #ifdef NQPROT
@@ -253,12 +255,12 @@ static const char *svc_nqstrings[] =
 	"dp_downloaddata / neh_skyboxsize / qex_servervars",		//50
 	"dp_updatestatubyte / neh_fog / qex_seq",	//51
 	"dp_effect / qex_achievement",				//52
-	"dp_effect2",			//53
-	"dp6_precache / dp5_sound2",	//54
-	"dp_spawnbaseline2",		//55
-	"dp_spawnstatic2",	//56 obsolete
-	"dp_entities",		//57
-	"dp_csqcentities",			//58
+	"dp_effect2 / qex_chat",			//53
+	"dp6_precache / dp5_sound2 / qex_levelcompleted",	//54
+	"dp_spawnbaseline2 / qex_backtolobby",		//55
+	"dp_spawnstatic2 / qex_localsound",	//56 obsolete
+	"dp_entities / qex_prompt",		//57
+	"dp_csqcentities / qex_loccenterprint",			//58
 	"dp_spawnstaticsound2",	//59
 	"dp_trailparticles",	//60
 	"dp_pointparticles",	//61
@@ -564,7 +566,7 @@ qboolean CL_EnqueDownload(const char *filename, const char *localname, unsigned
 
 		if (cls.state < ca_connected)
 			return false;
-		if (cls.demoplayback && cls.demoplayback != DPB_EZTV)
+		if (cls.demoplayback && !(cls.demoplayback == DPB_MVD && (cls.demoeztv_ext&EZTV_DOWNLOAD)))
 			return false;
 	}
 	COM_FileExtension(localname, ext, sizeof(ext));
@@ -809,7 +811,7 @@ void CL_DownloadFinished(qdownload_t *dl)
 
 	DL_Abort(dl, QDL_COMPLETED);
 
-	FS_FlushFSHashWritten(dl->tempname);
+	FS_FlushFSHashWritten(filename);
 
 	COM_FileExtension(filename, ext, sizeof(ext));
 
@@ -830,22 +832,9 @@ void CL_DownloadFinished(qdownload_t *dl)
 
 		Mod_FileWritten(filename);
 		{
-/*
-			extern int mod_numknown;
-			extern model_t	*mod_known;
-			for (i = 0; i < mod_numknown; i++)	//go and load this model now.
-			{
-				if (!strcmp(mod_known[i].name, filename))
-				{
-					Mod_ForName(mod_known[i].name, false);	//throw away result.
-					break;
-				}
-			}
-*/
-
 			for (i = 0; i < MAX_PRECACHE_MODELS; i++)	//go and load this model now.
 			{
-				if (!strcmp(cl.model_name[i], filename))
+				if (cl.model_name[i] && !strcmp(cl.model_name[i], filename))
 				{
 					if (cl.model_precache[i] && cl.model_precache[i]->loadstate == MLS_FAILED)
 						cl.model_precache[i]->loadstate = MLS_NOTLOADED;
@@ -875,7 +864,7 @@ void CL_DownloadFinished(qdownload_t *dl)
 #ifdef HAVE_LEGACY
 			for (i = 0; i < MAX_VWEP_MODELS; i++)
 			{
-				if (!strcmp(cl.model_name_vwep[i], filename))
+				if (cl.model_name_vwep[i] && !strcmp(cl.model_name_vwep[i], filename))
 				{
 					if (cl.model_precache_vwep[i] && cl.model_precache_vwep[i]->loadstate == MLS_FAILED)
 						cl.model_precache_vwep[i]->loadstate = MLS_NOTLOADED;
@@ -1236,7 +1225,7 @@ static void Model_CheckDownloads (void)
 	}
 #endif
 
-	for (i = 1; cl.model_name[i][0]; i++)
+	for (i = 1; i < countof(cl.model_name) && cl.model_name[i]; i++)
 	{
 		s = cl.model_name[i];
 		if (s[0] == '*')
@@ -1258,11 +1247,9 @@ static void Model_CheckDownloads (void)
 	for (i = 0; i < MAX_VWEP_MODELS; i++)
 	{
 		s = cl.model_name_vwep[i];
-
-		if (!stricmp(COM_FileExtension(s, ext, sizeof(ext)), "dsp"))	//doom sprites are weird, and not really downloadable via this system
+		if (!s)
 			continue;
-
-		if (!*s)
+		if (!stricmp(COM_FileExtension(s, ext, sizeof(ext)), "dsp"))	//doom sprites are weird, and not really downloadable via this system
 			continue;
 
 		CL_CheckOrEnqueDownloadFile(s, s, DLLF_ALLOWWEB);
@@ -1382,7 +1369,7 @@ static int CL_LoadModels(int stage, qboolean dontactuallyload)
 	{
 		for (i=1 ; i<MAX_PRECACHE_MODELS ; i++)
 		{
-			if (!cl.model_name[i][0])
+			if (!cl.model_name[i])
 				skipstage();
 			else if (atstage())
 			{
@@ -1413,10 +1400,9 @@ static int CL_LoadModels(int stage, qboolean dontactuallyload)
 #ifdef HAVE_LEGACY
 		for (i = 0; i < MAX_VWEP_MODELS; i++)
 		{
-			if (!cl.model_name_vwep[i][0])
-				continue;
-
-			if (atstage())
+			if (!cl.model_name_vwep[i])
+				skipstage();
+			else if (atstage())
 			{
 #if 0
 				SCR_SetLoadingFile(cl.model_name_vwep[i]);
@@ -1438,7 +1424,7 @@ static int CL_LoadModels(int stage, qboolean dontactuallyload)
 		cl.worldmodel = cl.model_precache[1];
 		if (!cl.worldmodel || cl.worldmodel->type == mod_dummy)
 		{
-			if (!cl.model_name[1][0])
+			if (!cl.model_name[1])
 				Host_EndGame("Worldmodel name wasn't sent\n");
 //			else
 //				return stage;
@@ -1457,7 +1443,7 @@ static int CL_LoadModels(int stage, qboolean dontactuallyload)
 
 	for (i=1 ; i<MAX_CSMODELS ; i++)
 	{
-		if (!cl.model_csqcname[i][0])
+		if (!cl.model_csqcname[i])
 			skipstage();
 		else if (atstage())
 		{
@@ -1559,7 +1545,7 @@ static int CL_LoadSounds(int stage, qboolean dontactuallyload)
 
 	for (i=1 ; i<MAX_PRECACHE_SOUNDS ; i++)
 	{
-		if (!cl.sound_name[i][0])
+		if (!cl.sound_name[i])
 			break;
 
 		if (atstage())
@@ -1657,8 +1643,7 @@ static void Sound_CheckDownloads (void)
 	}
 #endif
 
-	for (i = 1; cl.sound_name[i][0]
-		; i++)
+	for (i = 1; i < countof(cl.model_name) && cl.sound_name[i]; i++)
 	{
 		Sound_CheckDownload(cl.sound_name[i]);
 	}
@@ -1883,7 +1868,7 @@ void CL_RequestNextDownload (void)
 		else
 #endif
 		{
-			if (cls.demoplayback == DPB_EZTV)
+			if (cls.demoplayback == DPB_MVD && cls.demoeztv_ext)
 			{
 				if (CL_RemoveClientCommands("qtvspawn"))
 					Con_DPrintf("Multiple prespawns\n");
@@ -1930,7 +1915,7 @@ void CL_RequestNextDownload (void)
 int CL_RequestADownloadChunk(void);
 void CL_SendDownloadReq(sizebuf_t *msg)
 {
-	if (cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 		return;	//tcp connection, so no need to constantly ask
 
 	if (!cls.download)
@@ -2118,9 +2103,9 @@ qboolean DL_Begun(qdownload_t *dl)
 	}
 	if (!dl->file)
 	{
-		char native[MAX_OSPATH];
-		FS_NativePath(dl->tempname+dl->prefixbytes, dl->fsroot, native, sizeof(native));
-		Con_TPrintf("Unable to open \"%s\"\n", native);
+		char displaypath[MAX_OSPATH];
+		FS_DisplayPath(dl->tempname+dl->prefixbytes, dl->fsroot, displaypath, sizeof(displaypath));
+		Con_TPrintf("Unable to open \"%s\"\n", displaypath);
 		return false;
 	}
 
@@ -2341,11 +2326,15 @@ static void CL_ParseChunkedDownload(qdownload_t *dl)
 					if (!strncmp(svname, "package/", 8))
 					{
 						int i, c;
+						char *pn;
 						Cmd_TokenizeString(cl.serverpacknames, false, false);
 						c = Cmd_Argc();
 						for (i = 0; i < c; i++)
 						{
-							if (!strcmp(Cmd_Argv(i), svname+8))
+							pn = Cmd_Argv(i);
+							if (*pn == '*')
+								pn++;	//'required'... so shouldn't really be missing.
+							if (!strcmp(pn, svname+8))
 								break;
 						}
 						if (i == c)
@@ -2637,10 +2626,10 @@ void DL_Abort(qdownload_t *dl, enum qdlabort aborttype)
 					FS_Remove(dl->localname+dl->prefixbytes, dl->fsroot);
 				if (!FS_Rename(dl->tempname+dl->prefixbytes, dl->localname+dl->prefixbytes, dl->fsroot))
 				{
-					char nativetmp[MAX_OSPATH], nativefinal[MAX_OSPATH];
-					FS_NativePath(dl->tempname+dl->prefixbytes, dl->fsroot, nativetmp, sizeof(nativetmp));
-					FS_NativePath(dl->localname+dl->prefixbytes, dl->fsroot, nativefinal, sizeof(nativefinal));
-					Con_Printf("Couldn't rename %s to %s\n", nativetmp, nativefinal);
+					char displaytmp[MAX_OSPATH], displayfinal[MAX_OSPATH];
+					FS_DisplayPath(dl->tempname+dl->prefixbytes, dl->fsroot, displaytmp, sizeof(displaytmp));
+					FS_DisplayPath(dl->localname+dl->prefixbytes, dl->fsroot, displayfinal, sizeof(displayfinal));
+					Con_Printf("Couldn't rename %s to %s\n", displaytmp, displayfinal);
 				}
 			}
 #ifdef PACKAGEMANAGER
@@ -2754,7 +2743,7 @@ static void CL_ParseDownload (qboolean zlib)
 #ifdef PEXT_CHUNKEDDOWNLOADS
 	if (cls.fteprotocolextensions & PEXT_CHUNKEDDOWNLOADS)
 	{
-		if (cls.demoplayback == DPB_EZTV)
+		if (cls.demoplayback == DPB_MVD && cls.demoeztv_ext)
 			Host_EndGame("CL_ParseDownload: chunked download on qtv proxy.");
 		CL_ParseChunkedDownload(dl);
 		return;
@@ -2785,7 +2774,7 @@ static void CL_ParseDownload (qboolean zlib)
 		return;
 	}
 
-	if (cls.demoplayback && cls.demoplayback != DPB_EZTV)
+	if (cls.demoplayback && !cls.demoeztv_ext)
 	{
 		if (size > 0)
 			MSG_ReadSkip(size);
@@ -3366,6 +3355,9 @@ static void CLQW_ParseServerData (void)
 	if (cls.ezprotocolextensions1 & ~EZPEXT1_CLIENTSUPPORT)
 		Con_TPrintf (CON_WARNING"Using unknown ezquake extensions (%#x)\n", cls.ezprotocolextensions1&~EZPEXT1_CLIENTSUPPORT);
 
+	if ((cls.ezprotocolextensions1 & EZPEXT1_HIDDEN_MESSAGES) && !cls.demoplayback)
+		Con_TPrintf (CON_WARNING"Server's EZPEXT1_HIDDEN_MESSAGES extension does not make sense outside of demos\n");	//we do not request this at all. its safe to blame the server.
+
 	if (cls.fteprotocolextensions & PEXT_FLOATCOORDS)
 	{
 		cls.netchan.netprim.coordtype = COORDTYPE_FLOAT_32;
@@ -3413,7 +3405,7 @@ static void CLQW_ParseServerData (void)
 	}
 
 	/*mvds have different parsing*/
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 	{
 		extern float olddemotime;
 		int i,j;
@@ -3571,7 +3563,7 @@ static void CLQW_ParseServerData (void)
 	}
 
 	memset(cl.sound_name, 0, sizeof(cl.sound_name));
-	if (cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD && (cls.demoeztv_ext&EZTV_DOWNLOAD))
 	{
 		if (CL_RemoveClientCommands("qtvsoundlist"))
 			Con_DPrintf("Multiple soundlists\n");
@@ -3830,6 +3822,9 @@ void CL_ParseEstablished(void)
 
 	if (cls.netchan.remote_address.type != NA_LOOPBACK)
 	{
+		char fp[DIGEST_MAXSIZE*3+1+4];
+		char dig[DIGEST_MAXSIZE+1];
+		char cert[8192];
 		const char *security;
 		switch(cls.protocol)
 		{
@@ -3839,13 +3834,26 @@ void CL_ParseEstablished(void)
 		case CP_QUAKE3:		Con_Printf (S_COLOR_GRAY"Q3 ");	break;
 		default: break;
 		}
+		*fp = 0;
 		if (NET_IsEncrypted(&cls.netchan.remote_address))
-			security = localtext("^["S_COLOR_GREEN"encrypted\\tip\\Any passwords will be sent securely, but will still be readable by the server admin^]");
+		{
+			if (cls.netchan.remote_address.prot == NP_DTLS)
+			{
+				int sz = NET_GetConnectionCertificate(cls.sockets, &cls.netchan.remote_address, QCERT_PEERCERTIFICATE, cert,sizeof(cert));
+				if (sz >= 0)
+				{
+					Q_strncpyz(fp, "?fp=",sizeof(fp));
+					sz = 4+Base64_EncodeBlockURI(dig, CalcHash(&hash_certfp, dig,sizeof(dig), cert, sz), fp+4,sizeof(fp)-4);
+					fp[sz] = 0;
+				}
+			}
+			security = localtext("^["S_COLOR_GREEN"encrypted\\tip\\Any passwords will be sent securely, but will still be readable by the server admin\n^]");
+		}
 		else
 			security = localtext("^["S_COLOR_RED"plain-text\\tip\\"CON_WARNING"Do not type passwords as they can potentially be seen by network sniffers^]");
 
 		Con_Printf ("\r");
-		Con_TPrintf ("Connected to ^["S_COLOR_BLUE"%s\\type\\connect %s^] (%s).\n", cls.servername, cls.servername, security);
+		Con_TPrintf ("Connected to ^["S_COLOR_BLUE"%s"S_COLOR_GRAY"%s\\type\\connect %s%s^] (%s).\n", cls.servername, fp, cls.servername, fp, security);
 	}
 }
 
@@ -3953,7 +3961,10 @@ static void CLNQ_ParseProtoVersion(void)
 	}
 	else if (protover == PROTOCOL_VERSION_H2)
 	{
-		Host_EndGame ("\nUnable to connect to standard Hexen2 servers. Host the game with "DISTRIBUTION"\n");
+		if (cls.demoplayback)
+			cls.protocol_nq = CPNQ_H2MP;
+		else
+			Host_EndGame ("\nUnable to connect to standard Hexen2 servers. Host the game with "DISTRIBUTION"\n");
 	}
 	else if (protover == PROTOCOL_VERSION_BJP1)
 	{
@@ -4067,7 +4078,14 @@ static void CLNQ_ParseServerData(void)		//Doesn't change gamedir - use with caut
 
 	Surf_PreNewMap();
 
-	memset (cl.model_name, 0, sizeof(cl.model_name));
+	for (nummodels=0; nummodels < countof(cl.model_name); nummodels++)
+	{
+		if (cl.model_name[nummodels])
+		{
+			Z_Free(cl.model_name[nummodels]);
+			cl.model_name[nummodels] = NULL;
+		}
+	}
 	for (nummodels=1 ; ; nummodels++)
 	{
 		str = MSG_ReadString ();
@@ -4078,7 +4096,7 @@ static void CLNQ_ParseServerData(void)		//Doesn't change gamedir - use with caut
 			Con_TPrintf ("Server sent too many model precaches\n");
 			return;
 		}
-		Q_strncpyz(cl.model_name[nummodels], str, sizeof(cl.model_name[nummodels]));
+		Z_StrDupPtr(&cl.model_name[nummodels], str);
 		if (*str != '*' && strcmp(str, "null"))	//not inline models!
 			CL_CheckOrEnqueDownloadFile(str, NULL, ((nummodels==1)?DLLF_REQUIRED|DLLF_ALLOWWEB:0));
 
@@ -4088,7 +4106,7 @@ static void CLNQ_ParseServerData(void)		//Doesn't change gamedir - use with caut
 		if (!strcmp(cl.model_name[nummodels],"progs/player.mdl"))
 			cl_playerindex = nummodels;
 #ifdef HAVE_LEGACY
-		if (*cl.model_name_vwep[0] && !strcmp(cl.model_name[nummodels],cl.model_name_vwep[0]) && cl_playerindex == -1)
+		if (cl.model_name_vwep[0] && !strcmp(cl.model_name[nummodels],cl.model_name_vwep[0]) && cl_playerindex == -1)
 			cl_playerindex = nummodels;
 #endif
 		if (!strcmp(cl.model_name[nummodels],"progs/h_player.mdl"))
@@ -4113,7 +4131,14 @@ static void CLNQ_ParseServerData(void)		//Doesn't change gamedir - use with caut
 		Mod_TouchModel (str);
 	}
 
-	memset (cl.sound_name, 0, sizeof(cl.sound_name));
+	for (numsounds=0; numsounds < countof(cl.sound_name); numsounds++)
+	{
+		if (cl.sound_name[numsounds])
+		{
+			Z_Free(cl.sound_name[numsounds]);
+			cl.sound_name[numsounds] = NULL;
+		}
+	}
 	for (numsounds=1 ; ; numsounds++)
 	{
 		str = MSG_ReadString ();
@@ -4124,7 +4149,7 @@ static void CLNQ_ParseServerData(void)		//Doesn't change gamedir - use with caut
 			Con_TPrintf ("Server sent too many sound precaches\n");
 			return;
 		}
-		Q_strncpyz(cl.sound_name[numsounds], str, sizeof(cl.sound_name[numsounds]));
+		Z_StrDupPtr(&cl.sound_name[numsounds], str);
 		cl.sound_precache[numsounds] = S_FindName(cl.sound_name[numsounds], true, false);
 
 		Sound_CheckDownload(str);
@@ -4351,24 +4376,27 @@ static void CLNQ_ParseClientdata (void)
 
 	if (bits & SU_VIEWHEIGHT)
 		CL_SetStatInt(0, STAT_VIEWHEIGHT, MSG_ReadChar ());
-	else if (!CPNQ_IS_DP || cls.protocol_nq <= CPNQ_DP5)
+	else if ((!CPNQ_IS_DP || cls.protocol_nq <= CPNQ_DP5) && cls.protocol_nq != CPNQ_H2MP)
 		CL_SetStatInt(0, STAT_VIEWHEIGHT, DEFAULT_VIEWHEIGHT);
 
 	if (bits & SU_IDEALPITCH)
 		CL_SetStatInt(0, STAT_IDEALPITCH, MSG_ReadChar ());
-	else
+	else if (cls.protocol_nq != CPNQ_H2MP)
 		CL_SetStatInt(0, STAT_IDEALPITCH, 0);
 
+	if (cls.protocol_nq == CPNQ_H2MP && (bits & (1<<8)/*SU_IDEALROLL*/))
+		MSG_ReadChar ();
+
 	for (i=0 ; i<3 ; i++)
 	{
 		if (bits & (SU_PUNCH1<<i) )
 			CL_SetStatFloat(seat, STAT_PUNCHANGLE_X+i, CPNQ_IS_DP?MSG_ReadAngle16():MSG_ReadChar());
-		else
+		else if (cls.protocol_nq != CPNQ_H2MP)
 			CL_SetStatFloat(seat, STAT_PUNCHANGLE_X+i, 0);
 
 		if (CPNQ_IS_DP && bits & (DPSU_PUNCHVEC1<<i))
 			CL_SetStatFloat(seat, STAT_PUNCHVECTOR_X+i, MSG_ReadCoord());
-		else
+		else if (cls.protocol_nq != CPNQ_H2MP)
 			CL_SetStatFloat(seat, STAT_PUNCHVECTOR_X+i, 0);
 
 		if (bits & (SU_VELOCITY1<<i))
@@ -4378,7 +4406,7 @@ static void CLNQ_ParseClientdata (void)
 			else
 				pl->velocity[i] = MSG_ReadChar()*16;
 		}
-		else
+		else if (cls.protocol_nq != CPNQ_H2MP)
 			pl->velocity[i] = 0;
 	}
 
@@ -4412,6 +4440,12 @@ static void CLNQ_ParseClientdata (void)
 	{
 		/*nothing in dp6+*/
 	}
+	else if (cls.protocol_nq == CPNQ_H2MP)
+	{	//only changed stuff
+		if (bits & SU_WEAPONFRAME)	CL_SetStatInt(0, STAT_WEAPONFRAME, MSG_ReadByte());
+		if (bits & SU_ARMOR)		CL_SetStatInt(0, STAT_ARMOR, MSG_ReadByte());
+		if (bits & SU_WEAPONMODEL)	CL_SetStatInt(0, STAT_WEAPONMODELI, MSG_ReadUInt16());
+	}	//nothing else.
 	else
 	{
 		int weaponmodel = 0, armour = 0, weaponframe = 0, health = 0, currentammo = 0, shells = 0, nails = 0, rockets = 0, cells = 0, activeweapon = 0;
@@ -4525,14 +4559,16 @@ static void CL_ParseSoundlist (qboolean lots)
 //		if (!strcmp(str+strlen(str)-4, ".mp3"))	//don't let the server send us a specific mp3. convert it to wav and this way we know not to look outside the quake path for it.
 //			strcpy(str+strlen(str)-4, ".wav");
 
-		strcpy (cl.sound_name[numsounds], str);
+		Z_StrDupPtr(&cl.sound_name[numsounds], str);
 	}
 
 	n = (cl.protocol_qw>=26)?MSG_ReadByte():0;
 
 	if (n)
 	{
-		if (cls.demoplayback != DPB_EZTV)
+		if (cls.demoplayback == DPB_MVD && (cls.demoeztv_ext&EZTV_DOWNLOAD))
+			;
+		else
 		{
 			if (CL_RemoveClientCommands("soundlist") && !(cls.fteprotocolextensions2 & PEXT2_REPLACEMENTDELTAS))
 				Con_DPrintf("Multiple soundlists\n");
@@ -4553,7 +4589,7 @@ static void CL_ParseSoundlist (qboolean lots)
 	else
 #endif
 	{
-		if (cls.demoplayback == DPB_EZTV)
+		if (cls.demoplayback == DPB_MVD && cls.demoeztv_ext)
 		{
 			if (CL_RemoveClientCommands("qtvmodellist"))
 				Con_DPrintf("Multiple modellists\n");
@@ -4592,11 +4628,11 @@ static void CL_ParseModellist (qboolean lots)
 		if (!str[0])
 			break;
 		nummodels++;
-		if (nummodels==1)
-			SCR_ImageName(cl.model_name[nummodels]);
 		if (nummodels>=MAX_PRECACHE_MODELS)
 			Host_EndGame ("Server sent too many model_precache");
-		strcpy (cl.model_name[nummodels], str);
+		Z_StrDupPtr(&cl.model_name[nummodels], str);
+		if (nummodels==1)
+			SCR_ImageName(cl.model_name[nummodels]);
 
 		//qw has a special network protocol for spikes.
 		if (!strcmp(cl.model_name[nummodels],"progs/spike.mdl"))
@@ -4604,7 +4640,7 @@ static void CL_ParseModellist (qboolean lots)
 		if (!strcmp(cl.model_name[nummodels],"progs/player.mdl"))
 			cl_playerindex = nummodels;
 #ifdef HAVE_LEGACY
-		if (*cl.model_name_vwep[0] && !strcmp(cl.model_name[nummodels],cl.model_name_vwep[0]) && cl_playerindex == -1)
+		if (cl.model_name_vwep[0] && !strcmp(cl.model_name[nummodels],cl.model_name_vwep[0]) && cl_playerindex == -1)
 			cl_playerindex = nummodels;
 #endif
 		if (!strcmp(cl.model_name[nummodels],"progs/h_player.mdl"))
@@ -4635,7 +4671,9 @@ static void CL_ParseModellist (qboolean lots)
 
 	if (n)
 	{
-		if (cls.demoplayback != DPB_EZTV)
+		if (cls.demoplayback == DPB_MVD && cls.demoeztv_ext)
+			;
+		else
 		{
 			if (CL_RemoveClientCommands("modellist") && !(cls.fteprotocolextensions2 & PEXT2_REPLACEMENTDELTAS))
 				Con_DPrintf("Multiple modellists\n");
@@ -4645,10 +4683,15 @@ static void CL_ParseModellist (qboolean lots)
 		return;
 	}
 
+#ifdef QUAKESTATS
+	if (cls.demoplayback == DPB_MVD && !cl.model_name_vwep[0] && !(cls.fteprotocolextensions2&PEXT2_REPLACEMENTDELTAS))
+		CL_ParseStuffCmd("//vwep vwplayer w_axe w_shot w_shot2 w_nail w_nail2 w_rock w_rock2 w_light", 0);
+#endif
+
 	SCR_SetLoadingFile("loading data");
 
 	//we need to try to load it now if we can, so any embedded archive will be loaded *before* we start looking for other content...
-	cl.model_precache[1] = Mod_ForName (cl.model_name[1], MLV_SILENTSYNC);
+	cl.model_precache[1] = cl.model_name[1]?Mod_ForName (cl.model_name[1], MLV_SILENTSYNC):NULL;
 	if (cl.model_precache[1] && cl.model_precache[1]->loadstate == MLS_LOADED)
 		FS_LoadMapPackFile(cl.model_precache[1]->name, cl.model_precache[1]->archive);
 
@@ -4840,7 +4883,7 @@ parsemodelindex:
 			s++;	//*sigh*
 		if (i == 255)
 			s = "*playermodel";	//something special.
-		Q_strncpyz(cl.model_name[i], s, MAX_QPATH);
+		Z_StrDupPtr(&cl.model_name[i], s);
 		if (cl.model_name[i][0] == '#')
 		{
 			if (cl.numq2visibleweapons < Q2MAX_VISIBLE_WEAPONS)
@@ -4861,7 +4904,7 @@ parsesoundindex:
 			return;
 		if (*s == '/')
 			s++;	//*sigh*
-		Q_strncpyz(cl.sound_name[i], s, MAX_QPATH);
+		Z_StrDupPtr(&cl.sound_name[i], s);
 		if (cl.contentstage)
 			cl.sound_precache[i] = S_PrecacheSound (s);
 	}
@@ -4870,24 +4913,21 @@ parsesoundindex:
 		i -= Q2EXCS_IMAGES;
 		if ((unsigned int)i >= countof(cl.image_name))
 			return;
-		Z_Free(cl.image_name[i]);
-		cl.image_name[i] = Z_StrDup(s);
+		Z_StrDupPtr(&cl.image_name[i], s);
 	}
 	else if (i >= Q2EXCS_ITEMS && i < Q2EXCS_ITEMS+Q2MAX_ITEMS)
 	{
 		i -= Q2EXCS_ITEMS;
 		if ((unsigned int)i >= countof(cl.item_name))
 			return;
-		Z_Free(cl.item_name[i]);
-		cl.item_name[i] = Z_StrDup(s);
+		Z_StrDupPtr(&cl.item_name[i], s);
 	}
 	else if (i >= Q2EXCS_GENERAL && i < Q2EXCS_GENERAL+Q2EXMAX_GENERAL)
 	{
 		i -= Q2EXCS_GENERAL;
 		if ((unsigned int)i >= Q2MAX_CLIENTS)//countof(cl.configstring_general))
 			return;
-		Z_Free(cl.configstring_general[i]);
-		cl.configstring_general[i] = Z_StrDup(s);
+		Z_StrDupPtr(&cl.configstring_general[i], s);
 	}
 	else if (i >= Q2EXCS_PLAYERSKINS && i < Q2EXCS_PLAYERSKINS+Q2EXMAX_CLIENTS)
 	{
@@ -4895,8 +4935,7 @@ parsesoundindex:
 		i += Q2EXMAX_CLIENTS;
 		if ((unsigned int)i >= countof(cl.configstring_general))
 			return;
-		Z_Free(cl.configstring_general[i]);
-		cl.configstring_general[i] = Z_StrDup(s);
+		Z_StrDupPtr(&cl.configstring_general[i], s);
 
 		CLQ2_ParseClientinfo (i, s);
 	}
@@ -4985,6 +5024,8 @@ static void CL_ParseBaseline (entity_state_t *es, int baselinetype2)
 		bits = FITZ_B_LARGEMODEL|FITZ_B_LARGEFRAME;	//dp's baseline2 always has these (regular baseline is unmodified)
 	else if (cls.protocol == CP_NETQUAKE && CPNQ_IS_BJP)
 		bits = FITZ_B_LARGEMODEL;	//bjp always uses shorts for models.
+	else if (cls.protocol == CP_NETQUAKE && cls.protocol_nq == CPNQ_H2MP)
+		bits = FITZ_B_LARGEMODEL;	//urgh
 	else
 		bits = 0;	//vanilla nq or qw
 
@@ -4993,6 +5034,13 @@ static void CL_ParseBaseline (entity_state_t *es, int baselinetype2)
 	es->colormap = MSG_ReadByte();
 	es->skinnum = MSG_ReadByte();
 
+	if (cls.protocol == CP_NETQUAKE && cls.protocol_nq == CPNQ_H2MP)
+	{
+		es->scale = MSG_ReadByte();
+		es->hexen2flags = MSG_ReadByte();
+		es->abslight = MSG_ReadByte();
+	}
+
 	for (i=0 ; i<3 ; i++)
 	{
 		es->origin[i] = MSG_ReadCoord ();
@@ -5199,7 +5247,7 @@ static void CL_ParseStaticSound (unsigned int flags)
 
 	for (i=0 ; i<3 ; i++)
 		org[i] = MSG_ReadCoord ();
-	if (flags || (cls.protocol == CP_NETQUAKE && cls.protocol_nq == CPNQ_BJP2))
+	if (flags || (cls.protocol == CP_NETQUAKE && (cls.protocol_nq == CPNQ_BJP2 || cls.protocol_nq == CPNQ_H2MP)))
 	{
 		if (cls.fteprotocolextensions2&PEXT2_LERPTIME)
 			sound_num = (unsigned short)MSG_ReadULEB128();
@@ -5388,7 +5436,7 @@ static void CLNQ_ParseStartSoundPacket(void)
 {
 	vec3_t  pos, vel;
 	int 	channel, ent;
-	int 	sound_num;
+	unsigned int 	sound_num;
 	int 	volume;
 	int 	field_mask;
 	float 	attenuation;
@@ -5456,12 +5504,17 @@ static void CLNQ_ParseStartSoundPacket(void)
 	else
 		sound_num = (unsigned char)MSG_ReadByte ();
 
-	if (ent > MAX_EDICTS)
-		Host_EndGame ("CL_ParseStartSoundPacket: ent = %i", ent);
-
 	for (i=0 ; i<3 ; i++)
 		pos[i] = MSG_ReadCoord ();
 
+	if (ent > MAX_EDICTS)
+		Host_EndGame ("CL_ParseStartSoundPacket: ent = %i", ent);
+	if (sound_num >= MAX_PRECACHE_SOUNDS)
+		Host_EndGame ("CL_ParseStartSoundPacket: sndidx = %i", sound_num);
+
+	if (!cl.sound_name[sound_num])
+		return;	//nope, not precached yet... silly raqces.
+
 #ifdef CSQC_DAT
 	if (!CSQC_StartSound(ent, channel, cl.sound_name[sound_num], pos, volume/255.0, attenuation, pitchadj, timeofs, flags))
 #endif
@@ -5511,7 +5564,7 @@ void CL_ParseClientdata (void)
 	}
 	else
 #endif
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 	{
 		cl.oldparsecount = i - 1;
 		oldparsecountmod = cl.oldparsecount & UPDATE_MASK;
@@ -6054,7 +6107,7 @@ static void CL_SetStatNumeric (int pnum, int stat, int ivalue, float fvalue)
 	}
 #endif
 
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 	{
 		extern int cls_lastto;
 		cl.players[cls_lastto].stats[stat]=ivalue;
@@ -6098,13 +6151,13 @@ static void CL_SetStatNumeric (int pnum, int stat, int ivalue, float fvalue)
 #endif
 }
 
-static void CL_SetStatString (int pnum, int stat, char *value)
+static void CL_SetStatString (int pnum, int stat, const char *value)
 {
 	if (stat < 0 || stat >= MAX_CL_STATS)
 		return;
 //		Host_EndGame ("CL_SetStat: %i is invalid", stat);
 
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 	{
 		extern int cls_lastto;
 		//Z_Free(cl.players[cls_lastto].statsstr[stat]);
@@ -6236,7 +6289,7 @@ static char *CL_ParseChat(char *text, player_info_t **player, int *msgflags)
 		if (!cls.demoplayback)
 			Sys_ServerActivity();	//chat always flashes the screen..
 
-		if (Ignore_Message((*player)->name, s, flags))
+		if (*player && Ignore_Message((*player)->name, s, flags))
 			return NULL;
 
 		//check f_ stuff
@@ -6715,13 +6768,17 @@ static char printtext[4096];
 static void CL_ParsePrint(const char *msg, int level)
 {
 	char n, *e;
-	if (strlen(printtext) + strlen(msg) >= sizeof(printtext))
+	if (strlen(printtext) + strlen(msg)+2 >= sizeof(printtext))
 	{
 		Con_Printf("%s", printtext);
 		Q_strncpyz(printtext, msg, sizeof(printtext));
 	}
 	else
 		strcat(printtext, msg);	//safe due to size on if.
+#ifdef HAVE_LEGACY	//eztv is fucking nasty.
+	if (level == PRINT_CHAT && *printtext == '#' && printtext[1] >= '0' && printtext[1] <= '9' && !strchr(printtext, '\n'))
+		strcat(printtext, "\n");
+#endif
 	while((e = strchr(printtext, '\n')) || (e = strchr(printtext, '\r')))
 	{
 		n = e[1];
@@ -6994,13 +7051,18 @@ static void CL_ParseStuffCmd(char *msg, int destsplit)	//this protects stuffcmds
 				if (strcmp(mname, "-"))
 				{
 					mname = va("progs/%s.mdl", Cmd_Argv(i));
-					Q_strncpyz(cl.model_name_vwep[i], mname, sizeof(cl.model_name_vwep[i]));
+					Z_StrDupPtr(&cl.model_name_vwep[i], mname);
 					if (cls.state == ca_active)
 					{
 						CL_CheckOrEnqueDownloadFile(cl.model_name_vwep[i], NULL, 0);
 						cl.model_precache_vwep[i] = Mod_ForName(cl.model_name_vwep[i], MLV_WARN);
 					}
 				}
+				else
+				{
+					Z_Free(cl.model_name_vwep[i]);
+					cl.model_name_vwep[i] = NULL;
+				}
 			}
 		}
 #endif
@@ -7109,6 +7171,42 @@ static void CL_ParseStuffCmd(char *msg, int destsplit)	//this protects stuffcmds
 				CL_ProcessUserInfo (slot, player);
 			}
 		}
+		else if (!strncmp(stufftext, "//qul ", 6))	//qtv user list
+		{
+			unsigned int cmd, id;
+			const char *name;
+			struct qtvviewers_s **link, *v;
+			Cmd_TokenizeString(stufftext+5, false, false);
+			cmd = atoi(Cmd_Argv(0));
+			id = atoi(Cmd_Argv(1));
+			name = Cmd_Argv(2);
+			for (link = &cls.qtvviewers; (v=*link); link = &v->next)
+			{
+				if (v->userid == id)
+					break;
+			}
+			switch(cmd)
+			{
+			case 3://del
+				if (v)
+				{
+					*link = v->next;
+					Z_Free(v);
+				}
+				break;
+			case 2://change
+			case 1://add
+				if (!v)
+				{	//new...
+					v = Z_Malloc(sizeof(*v));
+					v->next = cls.qtvviewers;
+					cls.qtvviewers = v;
+					v->userid = id;
+				}
+				Q_strncpyz(v->name, name, sizeof(v->name));
+				break;
+			}
+		}
 #ifdef PLUGINS
 		else if (!strncmp(stufftext, "//tinfo ", 8))			//ktx-team-info <pidx> <org xyz> <health> <armour> <STAT_ITEMS> <nickname>
 		{
@@ -7146,12 +7244,13 @@ static void CL_ParsePrecache(void)
 		if (i >= 1 && i < MAX_PRECACHE_MODELS)
 		{
 			model_t *model;
+			Z_StrDupPtr(&cl.model_name[i], s);
+
 			CL_CheckOrEnqueDownloadFile(s, s, DLLF_ALLOWWEB);
 			model = Mod_ForName(Mod_FixName(s, cl.model_name[1]), (i == 1&&!cl.sendprespawn)?MLV_ERROR:MLV_WARN);
 //			if (!model)
 //				Con_Printf("svc_precache: Mod_ForName(\"%s\") failed\n", s);
 			cl.model_precache[i] = model;
-			Q_strncpyz (cl.model_name[i], s, sizeof(cl.model_name[i]));
 		}
 		else
 			Con_Printf("svc_precache: model index %i outside range %i...%i\n", i, 1, MAX_PRECACHE_MODELS);
@@ -7168,7 +7267,7 @@ static void CL_ParsePrecache(void)
 //			if (!sfx)
 //				Con_Printf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s);
 			cl.sound_precache[i] = sfx;
-			Q_strncpyz (cl.sound_name[i], s, sizeof(cl.sound_name[i]));
+			Z_StrDupPtr(&cl.sound_name[i], s);
 		}
 		else
 			Con_Printf("svc_precache: sound index %i outside range %i...%i\n", i, 1, MAX_PRECACHE_SOUNDS);
@@ -7176,9 +7275,7 @@ static void CL_ParsePrecache(void)
 	case PC_PARTICLE:
 		if (i >= 1 && i < MAX_SSPARTICLESPRE)
 		{
-			if (cl.particle_ssname[i])
-				free(cl.particle_ssname[i]);
-			cl.particle_ssname[i] = strdup(s);
+			Z_StrDupPtr(&cl.particle_ssname[i], s);
 			cl.particle_ssprecache[i] = P_FindParticleType(s);
 			cl.particle_ssprecaches = true;
 		}
@@ -7344,6 +7441,71 @@ static void CL_ParseBaseAngle(int seat)
 		VRUI_SnapAngle();
 }
 
+void CLEZ_ParseHiddenDemoMessage(void)
+{
+	for(;;)
+	{
+		static float throttle;
+		int size = MSG_ReadLong();
+		unsigned int cmd;
+		if (size == -1 || msg_badread)
+			break;
+
+		cmd = MSG_ReadUInt16();
+		switch(cmd)
+		{
+		case 0xFFFF://mvdhidden_extended
+			return;	//can't handle it... protocol is stupid.
+
+		case 0x0003://mvdhidden_demoinfo
+			MSG_ReadUInt16();		//'more'
+			MSG_ReadSkip(size-2);	//probably json
+			break;
+		case 0x0007://mvdhidden_dmgdone
+			{
+				lerpents_t *le;
+				unsigned short typeandflags = MSG_ReadUInt16();
+				unsigned short attacker	= MSG_ReadUInt16();
+				unsigned short targ = MSG_ReadUInt16();
+				short dmg = MSG_ReadShort();
+				unsigned short issplash = !!(typeandflags&0x8000);
+				unsigned short isteamdamage = (attacker==targ) || (cl.teamplay && attacker-1<countof(cl.players)&&targ-1<countof(cl.players)&&!strcmp(cl.players[attacker].team, cl.players[targ].team));
+
+				typeandflags &= ~0x8000;
+
+				//let csqc handle it consistently with other ktx quirks.
+				for (cmd = 0; cmd < cl.splitclients; cmd++)
+					if (CL_TryTrackNum(&cl.playerview[cmd]) == attacker)
+					{
+						if (targ-1u < countof(cl.lerpplayers) && cl.lerpplayers[targ-1].sequence == cl.lerpentssequence)
+							le = &cl.lerpplayers[targ-1];	//favour use player indexes... stoopid qw.
+						else if (targ < cl.maxlerpents && cl.lerpents[targ].sequence == cl.lerpentssequence)
+							le = &cl.lerpents[targ];
+						else
+							break;	//nope, can't place it... despite it being an mvd.
+						CL_ParseStuffCmd(va("//ktx di %g %g %g %d %d %d %d\n", le->origin[0], le->origin[1], le->origin[2], typeandflags, dmg, issplash, isteamdamage), cmd);
+					}
+			}
+			break;
+
+/*		case 0x0000://mvdhidden_antilag_position
+		case 0x0001://mvdhidden_usercmd						// <byte: source playernum> <todo>
+		case 0x0002://mvdhidden_usercmd_weapons				// <byte: source playernum> <int: items> <byte[4]: ammo> <byte: result> <byte*: weapon priority (nul terminated)>
+		case 0x0004://mvdhidden_commentary_track
+		case 0x0005://mvdhidden_commentary_data
+		case 0x0006://mvdhidden_commentary_text_segment
+		case 0x0008://mvdhidden_usercmd_weapons_ss			// (same format as mvdhidden_usercmd_weapons)
+		case 0x0009://mvdhidden_usercmd_weapon_instruction	// <byte: playernum> <byte: flags> <int: sequence#> <int: mode> <byte[10]: weaponlist>
+		case 0x000A://mvdhidden_paused_duration
+*/
+		default:
+			Con_ThrottlePrintf(&throttle, 1, "CL_ParseHiddenDemoMessage: Unknown cmd %i\n", cmd);
+			MSG_ReadSkip(size);
+			break;
+		}
+	}
+}
+
 #define SHOWNETEOM(x) if(cl_shownet.value>=2)Con_Printf ("%3i:%s\n", MSG_GetReadCount(), x);
 #define SHOWNET(x) if(cl_shownet.value>=2)Con_Printf ("%3i:%s\n", MSG_GetReadCount()-1, x);
 #define SHOWNET2(x, y) if(cl_shownet.value>=2)Con_Printf ("%3i:%3i:%s\n", MSG_GetReadCount()-1, y, x);
@@ -7469,11 +7631,17 @@ void CLQW_ParseServerMessage (void)
 
 		case svc_nop:
 //			Con_Printf ("svc_nop\n");
+			//If we're using cl_shownet 2, combine large padding blocks into a single line, otherwise we'll get 1000+ lines from a single packet.
+			while (svc_nop == MSG_PeekByte())
+				MSG_ReadByte();
 			break;
 
 		case svc_disconnect:
-			if (cls.demoplayback == DPB_EZTV)	//eztv fails to detect the end of demos.
-				MSG_ReadString();
+			if (cls.demoplayback == DPB_MVD)	//eztv fails to detect the end of demos.
+			{
+				s = MSG_ReadString();
+				Con_Printf(CON_WARNING"svc_disconnect: %s\n", s);
+			}
 			else if (cls.demoplayback)
 			{
 				CL_Disconnect_f();
@@ -7555,7 +7723,7 @@ void CLQW_ParseServerMessage (void)
 			VectorCopy (cl.playerview[destsplit].viewangles, cl.playerview[destsplit].intermissionangles);
 			break;
 		case svc_setangle:
-			if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+			if (cls.demoplayback == DPB_MVD)
 			{
 				//I really don't get the point of fixangles in an mvd. just to disable interpolation for that frame?
 				int pl = MSG_ReadByte();
@@ -8802,6 +8970,296 @@ static void CLNQ_CheckPlayerIsSpectator(int i)
 		cl.players[i].spectator = false;
 }
 
+#ifdef HEXEN2
+#define svch2_particle2 34
+#define svch2_cutscene 35
+#define svch2_midiname 36
+#define svch2_updateclass 37
+#define svch2_particle3 38
+#define svch2_particle4 39
+#define svch2_setviewflags 40
+#define svch2_clearviewflags 41
+#define svch2_starteffect 42
+#define svch2_endeffect 43
+#define svch2_plaque 44
+#define svch2_particleexplosion 45
+#define svch2_setviewtint 46
+#define svch2_ref 47
+#define svch2_clearedicts 48
+#define svch2_updateinv 49
+#define svch2_setanglelerp 50
+#define svch2_updatekoth 51
+#define svch2_togglestatbar 52
+#define svch2_soundpos 53
+static qboolean CLH2_ParseServerSubMessage (int cmd)
+{
+	const int destsplit = 0;
+	int i,j;
+	const int svch2_first = svch2_particle2;
+	static const char *svc_h2strings[] =
+	{
+		"h2_particle2",
+		"h2_cutscene",
+		"h2_midiname",
+		"h2_updateclass",
+		"h2_particle3",
+		"h2_particle4",
+		"h2_setviewflags",
+		"h2_clearviewflags",
+		"h2_starteffect",
+		"h2_endeffect",
+		"h2_plaque",
+		"h2_particleexplosion",
+		"h2_setviewtint",
+		"h2_ref",
+		"h2_clearedicts",
+		"h2_updateinv",
+		"h2_setanglelerp",
+		"h2_updatekoth",
+		"h2_togglestatbar",
+		"h2_soundpos",
+	};
+	//no fastupdate checks needed here.
+	SHOWNET2((cmd>=svch2_first&&cmd<svch2_first+countof(svc_h2strings))?svc_h2strings[cmd-svch2_first]:svc_nqstrings[cmd>(sizeof(svc_nqstrings)/sizeof(char*))?0:cmd], cmd);
+
+	switch (cmd)
+	{
+	case svch2_midiname:
+		MSG_ReadString();
+		break;
+	case svch2_particle2:
+		CL_ParseParticleEffect2 ();
+		break;
+	case svch2_particle3:
+		CL_ParseParticleEffect3 ();
+		break;
+	case svch2_particle4:
+		CL_ParseParticleEffect4 ();
+		break;
+	case svch2_starteffect:
+		i = MSG_ReadByte(); //handle
+		j = MSG_ReadByte();	//type
+		switch(j)
+		{
+		case 1 /*ce_rain*/:
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadShort();
+			MSG_ReadShort();
+			MSG_ReadFloat();
+			break;
+		case 4/*ce_white_smoke*/:
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadFloat();
+			MSG_ReadFloat();
+			MSG_ReadFloat();
+			MSG_ReadFloat();
+			MSG_ReadFloat();
+			break;
+		case 5/*ce_bluespark*/:
+		case 6/*ce_yellowspark*/:
+		case 9/*ce_sm_white_flash*/:
+		case 13/*ce_sm_blue_flash*/:
+		case 15/*ce_sm_explosion*/:
+		case 16/*ce_lg_explosion*/:
+		case 17/*ce_floor_explosion*/:
+		case 19/*ce_blue_explosion*/:
+		case 32/*ce_xbow_explosion*/:
+		case 33/*ce_new_explosion*/:
+		case 34/*ce_magic_missile_explosion*/:
+		case 38/*ce_teleporterpuffs*/:
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			break;
+		case 39/*ce_teleporterbody*/:
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadFloat();
+			MSG_ReadFloat();
+			MSG_ReadFloat();
+			MSG_ReadFloat();
+			break;
+		case 40/*ce_boneshard*/:
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+
+			MSG_ReadFloat();
+			MSG_ReadFloat();
+			MSG_ReadFloat();
+
+			MSG_ReadFloat();
+			MSG_ReadFloat();
+			MSG_ReadFloat();
+
+			MSG_ReadFloat();
+			MSG_ReadFloat();
+			MSG_ReadFloat();
+			break;
+		case 43/*ce_snow*/:
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadByte();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadByte();
+			break;
+		case 55/*ce_chunk*/:
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadByte();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadCoord();
+			MSG_ReadByte();
+			break;
+		default:
+			Host_EndGame ("svch2_starteffect: unknown type %i", j);
+			return false;
+		}
+		break;
+	case svch2_endeffect:
+		MSG_ReadByte();	//handle
+		break;
+	case svch2_updateclass:
+		i = MSG_ReadByte();
+		j = MSG_ReadByte();
+		if (i < MAX_CLIENTS)
+			InfoBuf_SetValueForKey(&cl.players[i].userinfo, "cl_playerclass", va("%i", j));
+		break;
+	case svch2_updateinv:
+		cmd = MSG_ReadByte();
+		i = j = 0;
+		if (cmd&(1<<0))	i |= MSG_ReadByte()<<0;
+		if (cmd&(1<<1))	i |= MSG_ReadByte()<<8;
+		if (cmd&(1<<2))	i |= MSG_ReadByte()<<16;
+		if (cmd&(1<<3))	i |= MSG_ReadByte()<<24;
+		if (cmd&(1<<4))	j |= MSG_ReadByte()<<0;
+		if (cmd&(1<<5))	j |= MSG_ReadByte()<<8;
+		if (cmd&(1<<6))	j |= MSG_ReadByte()<<16;
+		if (cmd&(1<<7))	j |= MSG_ReadByte()<<24;
+		if (i & (1u<< 0)) CL_SetStatInt(destsplit, STAT_HEALTH, MSG_ReadShort());
+		if (i & (1u<< 1)) CL_SetStatInt(destsplit, STAT_H2_LEVEL, MSG_ReadByte());
+		if (i & (1u<< 2)) CL_SetStatInt(destsplit, STAT_H2_INTELLIGENCE, MSG_ReadByte());
+		if (i & (1u<< 3)) CL_SetStatInt(destsplit, STAT_H2_WISDOM, MSG_ReadByte());
+		if (i & (1u<< 4)) CL_SetStatInt(destsplit, STAT_H2_STRENGTH, MSG_ReadByte());
+		if (i & (1u<< 5)) CL_SetStatInt(destsplit, STAT_H2_DEXTERITY, MSG_ReadByte());
+		if (i & (1u<< 6)) CL_SetStatInt(destsplit, STAT_ACTIVEWEAPON, MSG_ReadByte());
+		if (i & (1u<< 7)) CL_SetStatInt(destsplit, STAT_H2_BLUEMANA, MSG_ReadByte());
+		if (i & (1u<< 8)) CL_SetStatInt(destsplit, STAT_H2_GREENMANA, MSG_ReadByte());
+		if (i & (1u<< 9)) CL_SetStatInt(destsplit, STAT_H2_EXPERIENCE, MSG_ReadLong());
+		if (i & (1u<<10)) CL_SetStatInt(destsplit, STAT_H2_CNT_TORCH, MSG_ReadByte());
+		if (i & (1u<<11)) CL_SetStatInt(destsplit, STAT_H2_CNT_H_BOOST, MSG_ReadByte());
+		if (i & (1u<<12)) CL_SetStatInt(destsplit, STAT_H2_CNT_SH_BOOST, MSG_ReadByte());
+		if (i & (1u<<13)) CL_SetStatInt(destsplit, STAT_H2_CNT_MANA_BOOST, MSG_ReadByte());
+		if (i & (1u<<14)) CL_SetStatInt(destsplit, STAT_H2_CNT_TELEPORT, MSG_ReadByte());
+		if (i & (1u<<15)) CL_SetStatInt(destsplit, STAT_H2_CNT_TOME, MSG_ReadByte());
+		if (i & (1u<<16)) CL_SetStatInt(destsplit, STAT_H2_CNT_SUMMON, MSG_ReadByte());
+		if (i & (1u<<17)) CL_SetStatInt(destsplit, STAT_H2_CNT_INVISIBILITY, MSG_ReadByte());
+		if (i & (1u<<18)) CL_SetStatInt(destsplit, STAT_H2_CNT_GLYPH, MSG_ReadByte());
+		if (i & (1u<<19)) CL_SetStatInt(destsplit, STAT_H2_CNT_HASTE, MSG_ReadByte());
+		if (i & (1u<<20)) CL_SetStatInt(destsplit, STAT_H2_CNT_BLAST, MSG_ReadByte());
+		if (i & (1u<<21)) CL_SetStatInt(destsplit, STAT_H2_CNT_POLYMORPH, MSG_ReadByte());
+		if (i & (1u<<22)) CL_SetStatInt(destsplit, STAT_H2_CNT_FLIGHT, MSG_ReadByte());
+		if (i & (1u<<23)) CL_SetStatInt(destsplit, STAT_H2_CNT_CUBEOFFORCE, MSG_ReadByte());
+		if (i & (1u<<24)) CL_SetStatInt(destsplit, STAT_H2_CNT_INVINCIBILITY, MSG_ReadByte());
+		if (i & (1u<<25)) CL_SetStatFloat(destsplit, STAT_H2_ARTIFACT_ACTIVE, MSG_ReadFloat());
+		if (i & (1u<<26)) CL_SetStatFloat(destsplit, STAT_H2_ARTIFACT_LOW, MSG_ReadFloat());
+		if (i & (1u<<27)) CL_SetStatInt(destsplit, STAT_H2_MOVETYPE, MSG_ReadByte());
+		if (i & (1u<<28)) CL_SetStatInt(destsplit, STAT_H2_CAMERAMODE, MSG_ReadByte());
+		if (i & (1u<<29)) CL_SetStatFloat(destsplit, STAT_H2_HASTED, MSG_ReadFloat());
+		if (i & (1u<<30)) CL_SetStatInt(destsplit, STAT_H2_INVENTORY, MSG_ReadByte());
+		if (i & (1u<<31)) CL_SetStatFloat(destsplit, STAT_H2_RINGS_ACTIVE, MSG_ReadFloat());
+		if (j & (1u<< 0)) CL_SetStatFloat(destsplit, STAT_H2_RINGS_LOW, MSG_ReadFloat());
+		if (j & (1u<< 1)) CL_SetStatInt(destsplit, STAT_H2_ARMOUR1, MSG_ReadByte());
+		if (j & (1u<< 2)) CL_SetStatInt(destsplit, STAT_H2_ARMOUR2, MSG_ReadByte());
+		if (j & (1u<< 3)) CL_SetStatInt(destsplit, STAT_H2_ARMOUR3, MSG_ReadByte());
+		if (j & (1u<< 4)) CL_SetStatInt(destsplit, STAT_H2_ARMOUR4, MSG_ReadByte());
+		if (j & (1u<< 5)) CL_SetStatInt(destsplit, STAT_H2_FLIGHT_T, MSG_ReadByte());
+		if (j & (1u<< 6)) CL_SetStatInt(destsplit, STAT_H2_WATER_T, MSG_ReadByte());
+		if (j & (1u<< 7)) CL_SetStatInt(destsplit, STAT_H2_TURNING_T, MSG_ReadByte());
+		if (j & (1u<< 8)) CL_SetStatInt(destsplit, STAT_H2_REGEN_T, MSG_ReadByte());
+		if (j & (1u<< 9)) /*CL_SetStatFloat(destsplit, STAT_H2_HASTE_T,*/( MSG_ReadFloat());
+		if (j & (1u<<10)) /*CL_SetStatFloat(destsplit, STAT_H2_TOMB_T,*/( MSG_ReadFloat());
+		if (j & (1u<<11)) CL_SetStatString(destsplit, STAT_H2_PUZZLE1, MSG_ReadString());
+		if (j & (1u<<12)) CL_SetStatString(destsplit, STAT_H2_PUZZLE2, MSG_ReadString());
+		if (j & (1u<<13)) CL_SetStatString(destsplit, STAT_H2_PUZZLE3, MSG_ReadString());
+		if (j & (1u<<14)) CL_SetStatString(destsplit, STAT_H2_PUZZLE4, MSG_ReadString());
+		if (j & (1u<<15)) CL_SetStatString(destsplit, STAT_H2_PUZZLE5, MSG_ReadString());
+		if (j & (1u<<16)) CL_SetStatString(destsplit, STAT_H2_PUZZLE6, MSG_ReadString());
+		if (j & (1u<<17)) CL_SetStatString(destsplit, STAT_H2_PUZZLE7, MSG_ReadString());
+		if (j & (1u<<18)) CL_SetStatString(destsplit, STAT_H2_PUZZLE8, MSG_ReadString());
+		if (j & (1u<<19)) CL_SetStatInt(destsplit, STAT_H2_MAXHEALTH, MSG_ReadShort());
+		if (j & (1u<<20)) CL_SetStatInt(destsplit, STAT_H2_MAXMANA, MSG_ReadByte());
+		if (j & (1u<<21)) CL_SetStatFloat(destsplit, STAT_H2_FLAGS, MSG_ReadFloat());
+		if (j & (1u<<22)) CL_SetStatInt(destsplit, STAT_H2_OBJECTIVE1, MSG_ReadLong());
+		if (j & (1u<<23)) CL_SetStatInt(destsplit, STAT_H2_OBJECTIVE2, MSG_ReadLong());
+		//if (j & (1u<<24)) CL_SetStat(destsplit, STAT_H2_, MSG_Read());
+		//if (j & (1u<<25)) CL_SetStat(destsplit, STAT_H2_, MSG_Read());
+		//if (j & (1u<<26)) CL_SetStat(destsplit, STAT_H2_, MSG_Read());
+		//if (j & (1u<<27)) CL_SetStat(destsplit, STAT_H2_, MSG_Read());
+		//if (j & (1u<<28)) CL_SetStat(destsplit, STAT_H2_, MSG_Read());
+		//if (j & (1u<<29)) CL_SetStat(destsplit, STAT_H2_, MSG_Read());
+		//if (j & (1u<<30)) CL_SetStat(destsplit, STAT_H2_, MSG_Read());
+		//if (j & (1u<<31)) CL_SetStat(destsplit, STAT_H2_, MSG_Read());
+		break;
+	case svch2_ref:
+		if (cls.signon == 4 - 1)
+		{	// first update is the final signon stage
+			cls.signon = 4;
+			CLNQ_SignonReply ();
+		}
+		CLH2_ParseEntities();
+		break;
+	case svch2_clearedicts:	//should have been handled by CLH2_ParseEntities (this also applies to fastupdates)
+		Host_EndGame ("CLNQ_ParseServerMessage: Unexpected server message (%i@%i)", cmd, MSG_GetReadCount()-1);
+		return false;
+	case svch2_togglestatbar:
+		break;	//wtf
+	case svch2_setanglelerp:	//urgh... demo playback has its own angle values, and with greater precision.
+		MSG_ReadAngle();
+		MSG_ReadAngle();
+		MSG_ReadAngle();
+		break;
+	case svch2_cutscene:
+	case svch2_setviewflags:
+	case svch2_clearviewflags:
+	case svch2_plaque:
+	case svch2_particleexplosion:
+	case svch2_setviewtint:
+	case svch2_updatekoth:
+	case svch2_soundpos:
+		//we're only aiming for demo compat, so we ignore this tat.
+		Host_EndGame ("CLH2_ParseServerMessage: Unimplemented server message (%i@%i)", cmd, MSG_GetReadCount()-1);
+		return false;
+	default:
+		return false;
+	}
+	return true;	//handled.
+}
+#endif
+
+
 void CLNQ_ParseServerMessage (void)
 {
 	const int	destsplit = 0;
@@ -8841,20 +9299,32 @@ void CLNQ_ParseServerMessage (void)
 			break;
 		}
 
-		if (cmd & 128)
+#ifdef HEXEN2
+		if (cls.protocol_nq == CPNQ_H2MP)
 		{
-			SHOWNET("fast update");
-			CLNQ_ParseEntity(cmd&127);
-			continue;
+			if (CLH2_ParseServerSubMessage(cmd))
+				continue;
+			//handle as a regular nq packet.
 		}
+		else
+#endif
+		{
+			if (cmd & 128)
+			{
+				SHOWNET("fast update");
+				CLNQ_ParseEntity(cmd&127);
+				continue;
+			}
 
-		SHOWNET2(svc_nqstrings[cmd>(sizeof(svc_nqstrings)/sizeof(char*))?0:cmd], cmd);
+			SHOWNET2(svc_nqstrings[cmd>(sizeof(svc_nqstrings)/sizeof(char*))?0:cmd], cmd);
+		}
 
 	// other commands
 		switch (cmd)
 		{
 		default:
 		badsvc:
+		case svc_bad:
 			CL_DumpPacket();
 			Host_EndGame ("CLNQ_ParseServerMessage: Illegible server message (%i@%i)", cmd, MSG_GetReadCount()-1);
 			return;
@@ -9058,7 +9528,7 @@ void CLNQ_ParseServerMessage (void)
 			cl.inframes[cls.netchan.incoming_sequence&UPDATE_MASK].receivedtime = realtime;
 			cl.inframes[cls.netchan.incoming_sequence&UPDATE_MASK].frameid = cls.netchan.incoming_sequence;
 
-			if (CPNQ_IS_DP)
+			if (CPNQ_IS_DP || cls.protocol_nq == CPNQ_H2MP)
 			{
 				int n = cls.netchan.incoming_sequence&UPDATE_MASK, o = (cls.netchan.incoming_sequence-1)&UPDATE_MASK;
 				cl.inframes[n].packet_entities.num_entities = cl.inframes[o].packet_entities.num_entities;
diff --git a/engine/client/cl_plugin.inc b/engine/client/cl_plugin.inc
index afa9cb04e..570cc0bf0 100644
--- a/engine/client/cl_plugin.inc
+++ b/engine/client/cl_plugin.inc
@@ -638,7 +638,6 @@ static void QDECL Plug_GetServerInfoRaw(char *outptr, size_t outlen)
 	case DPB_NONE:
 		break;
 	case DPB_MVD:
-	case DPB_EZTV:
 		Q_strncatz(outptr, "\\demotype\\mvd", outlen);
 		break;
 	case DPB_QUAKEWORLD:
@@ -692,7 +691,6 @@ static size_t QDECL Plug_GetServerInfoBlob(const char *key, void *outptr, size_t
 			case DPB_NONE:
 				break;
 			case DPB_MVD:
-			case DPB_EZTV:
 				blob = "mvd";
 				break;
 			case DPB_QUAKEWORLD:
@@ -888,7 +886,7 @@ static size_t QDECL Plug_GetTeamInfo(teamplayerinfo_t *players, size_t maxplayer
 			players->health = cl.playerview[seat].statsf[STAT_HEALTH];
 			Q_strncpyz(players->nick, "", sizeof(players->nick));
 		}
-		else if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+		else if (cls.demoplayback == DPB_MVD)
 		{	//scrape it from the mvd (assuming there is one...
 			players->items = cl.players[i].stats[STAT_ITEMS];
 			players->armor = cl.players[i].statsf[STAT_ARMOR];
diff --git a/engine/client/cl_pred.c b/engine/client/cl_pred.c
index 597c88bac..19ca04095 100644
--- a/engine/client/cl_pred.c
+++ b/engine/client/cl_pred.c
@@ -633,7 +633,7 @@ void CL_CalcClientTime(void)
 		//qw code can drift (but oh noes! my latency!)
 		//FIXME: nq code should be able to drift, but is apparently buggy somewhere and ends up uncomfortably stuttery right now.
 		//default is to drift in demos+SP but not live (oh noes! added latency!)
-		if (cls.protocol == CP_QUAKE2 || cls.protocol==CP_NETQUAKE/*FIXME*/ || (cls.protocol != CP_QUAKE3 && (!cl_lerp_smooth.ival || (cl_lerp_smooth.ival == 2 && !(cls.demoplayback || cl.allocated_client_slots == 1 || cl.playerview[0].spectator))) && cls.demoplayback != DPB_MVD))
+		if (cls.protocol == CP_QUAKE2 || cls.protocol==CP_NETQUAKE/*FIXME*/ || (cls.protocol != CP_QUAKE3 && (!cl_lerp_smooth.ival || (cl_lerp_smooth.ival == 2 && !(cls.demoplayback || cl.allocated_client_slots == 1 || cl.playerview[0].spectator))) && cls.demoplayback!=DPB_MVD))
 		{	//no drift logic
 			double f;
 			extern cvar_t cl_demospeed;
@@ -1018,7 +1018,7 @@ void CL_PredictMovePNum (int seat)
 	}
 #endif
 
-	if (cl.paused && !(cls.demoplayback!=DPB_MVD && cls.demoplayback!=DPB_EZTV) && pv->cam_state == CAM_FREECAM)
+	if (cl.paused && !(cls.demoplayback!=DPB_MVD) && pv->cam_state == CAM_FREECAM)
 		return;
 
 	if (!cl.validsequence)
@@ -1086,7 +1086,7 @@ void CL_PredictMovePNum (int seat)
 		nopred = true;
 
 	//these things also force-disable prediction
-	if ((cls.demoplayback==DPB_MVD || cls.demoplayback == DPB_EZTV) ||
+	if (cls.demoplayback==DPB_MVD ||
 		cl.intermissionmode != IM_NONE || cl.paused || pv->pmovetype == PM_NONE || pv->pmovetype == PM_FREEZE || CAM_ISLOCKED(pv))
 	{
 		nopred = true;
@@ -1169,7 +1169,7 @@ void CL_PredictMovePNum (int seat)
 	}
 	else
 	{
-		if (cls.demoplayback==DPB_MVD || cls.demoplayback == DPB_EZTV)
+		if (cls.demoplayback==DPB_MVD)
 		{
 			pv->nolocalplayer = false;
 			from.state = &cl.inframes[cl.ackedmovesequence & UPDATE_MASK].playerstate[pv->playernum];
diff --git a/engine/client/cl_screen.c b/engine/client/cl_screen.c
index 86088d40e..fe77d9d4f 100644
--- a/engine/client/cl_screen.c
+++ b/engine/client/cl_screen.c
@@ -2445,7 +2445,7 @@ void SCR_ImageName (const char *mapname)
 	strcpy(levelshotname, "levelshots/");
 	COM_FileBase(mapname, levelshotname + strlen(levelshotname), sizeof(levelshotname)-strlen(levelshotname));
 
-	if (qrenderer && scr_loadingscreen_aspect.ival >= 0)
+	if (qrenderer && scr_loadingscreen_aspect.ival >= 0 && *mapname)
 	{
 		R_LoadHiResTexture(levelshotname, NULL, IF_NOWORKER|IF_UIPIC|IF_NOPICMIP|IF_NOMIPMAP|IF_CLAMP);
 
@@ -2624,7 +2624,7 @@ SCR_ScreenShot_f
 */
 static void SCR_ScreenShot_f (void)
 {
-	char			sysname[1024];
+	char			displayname[1024];
 	char            pcxname[MAX_QPATH];
 	int                     i;
 	vfsfile_t *vfs;
@@ -2672,7 +2672,7 @@ static void SCR_ScreenShot_f (void)
 		}
 	}
 
-	FS_NativePath(pcxname, FS_GAMEONLY, sysname, sizeof(sysname));
+	FS_DisplayPath(pcxname, FS_GAMEONLY, displayname, sizeof(displayname));
 
 	rgbbuffer = VID_GetRGBInfo(&stride, &width, &height, &fmt);
 	if (rgbbuffer)
@@ -2680,12 +2680,12 @@ static void SCR_ScreenShot_f (void)
 		//regarding metadata - we don't really know what's on the screen, so don't write something that may be wrong (eg: if there's only a console, don't claim that its a 360 image)
 		if (SCR_ScreenShot(pcxname, FS_GAMEONLY, &rgbbuffer, 1, stride, width, height, fmt, false))
 		{
-			Con_Printf ("Wrote %s\n", sysname);
+			Con_Printf ("Wrote %s\n", displayname);
 			BZ_Free(rgbbuffer);
 			return;
 		}
 		BZ_Free(rgbbuffer);
-		Con_Printf (CON_ERROR "Couldn't write %s\n", sysname);
+		Con_Printf (CON_ERROR "Couldn't write %s\n", displayname);
 	}
 	else
 		Con_Printf (CON_ERROR "Couldn't get colour buffer for screenshot\n");
@@ -2881,9 +2881,9 @@ static void SCR_ScreenShot_Mega_f(void)
 	{
 		if (SCR_ScreenShot(filename, FS_GAMEONLY, buffers, numbuffers, stride[0], width[0], height[0], fmt[0], true))
 		{
-			char			sysname[1024];
-			FS_NativePath(filename, FS_GAMEONLY, sysname, sizeof(sysname));
-			Con_Printf ("Wrote %s\n", sysname);
+			char			displayname[1024];
+			FS_DisplayPath(filename, FS_GAMEONLY, displayname, sizeof(displayname));
+			Con_Printf ("Wrote %s\n", displayname);
 		}
 	}
 	else
@@ -3040,9 +3040,9 @@ static void SCR_ScreenShot_VR_f(void)
 		Con_Printf ("Unable to capture suitable screen image\n");
 	else if (SCR_ScreenShot(filename, FS_GAMEONLY, buffer, (stereo?2:1), stride, width, height*(stereo?1:2), TF_BGRX32, true))
 	{
-		char			sysname[1024];
-		FS_NativePath(filename, FS_GAMEONLY, sysname, sizeof(sysname));
-		Con_Printf ("Wrote %s\n", sysname);
+		char			displayname[1024];
+		FS_DisplayPath(filename, FS_GAMEONLY, displayname, sizeof(displayname));
+		Con_Printf ("Wrote %s\n", displayname);
 	}
 
 	BZ_Free(buffer[0]);
@@ -3058,7 +3058,7 @@ void SCR_ScreenShot_Cubemap_f(void)
 	int stride, fbwidth, fbheight;
 	uploadfmt_t fmt;
 	char filename[MAX_QPATH];
-	char			sysname[1024];
+	char displayname[1024];
 	char *fname = Cmd_Argv(1);
 	int i, firstside;
 	char olddrawviewmodel[64];	//hack, so we can set r_drawviewmodel to 0 so that it doesn't appear in screenshots even if the csqc is generating new data.
@@ -3189,8 +3189,8 @@ void SCR_ScreenShot_Cubemap_f(void)
 			{
 				if (Image_WriteDDSFile(filename, FS_GAMEONLY, &mips))
 				{
-					FS_NativePath(filename, FS_GAMEONLY, sysname, sizeof(sysname));
-					Con_Printf ("Wrote %s\n", sysname);
+					FS_DisplayPath(filename, FS_GAMEONLY, displayname, sizeof(displayname));
+					Con_Printf ("Wrote %s\n", displayname);
 				}
 			}
 #endif
@@ -3199,8 +3199,8 @@ void SCR_ScreenShot_Cubemap_f(void)
 			{
 				if (Image_WriteKTXFile(filename, FS_GAMEONLY, &mips))
 				{
-					FS_NativePath(filename, FS_GAMEONLY, sysname, sizeof(sysname));
-					Con_Printf ("Wrote %s\n", sysname);
+					FS_DisplayPath(filename, FS_GAMEONLY, displayname, sizeof(displayname));
+					Con_Printf ("Wrote %s\n", displayname);
 				}
 			}
 #endif
@@ -3249,13 +3249,13 @@ void SCR_ScreenShot_Cubemap_f(void)
 
 				if (SCR_ScreenShot(filename, FS_GAMEONLY, &buffer, 1, stride, fbwidth, fbheight, fmt, false))
 				{
-					FS_NativePath(filename, FS_GAMEONLY, sysname, sizeof(sysname));
-					Con_Printf ("Wrote %s\n", sysname);
+					FS_DisplayPath(filename, FS_GAMEONLY, displayname, sizeof(displayname));
+					Con_Printf ("Wrote %s\n", displayname);
 				}
 				else
 				{
-					FS_NativePath(filename, FS_GAMEONLY, sysname, sizeof(sysname));
-					Con_Printf ("Failed to write %s\n", sysname);
+					FS_DisplayPath(filename, FS_GAMEONLY, displayname, sizeof(displayname));
+					Con_Printf ("Failed to write %s\n", displayname);
 				}
 				BZ_Free(buffer);
 			}
diff --git a/engine/client/client.h b/engine/client/client.h
index d8f9bc1d3..c3a4f0ce7 100644
--- a/engine/client/client.h
+++ b/engine/client/client.h
@@ -475,6 +475,7 @@ typedef struct
 		CPNQ_BJP1,	//16bit models, strict 8bit sounds (otherwise based on nehahra)
 		CPNQ_BJP2,	//16bit models, strict 16bit sounds
 		CPNQ_BJP3,	//16bit models, flagged 16bit sounds, 8bit static sounds.
+		CPNQ_H2MP,	//urgh
 		CPNQ_FITZ666, /*and rmqe999 protocol, which is a strict superset*/
 		CPNQ_DP5,
 		CPNQ_DP6,
@@ -519,7 +520,7 @@ typedef struct
 // entering a map (and clearing client_state_t)
 	vfsfile_t	*demooutfile;
 
-	enum{DPB_NONE,DPB_QUAKEWORLD,DPB_MVD,DPB_EZTV,
+	enum{DPB_NONE,DPB_QUAKEWORLD,DPB_MVD,
 #ifdef NQPROT
 		DPB_NETQUAKE,
 #endif
@@ -527,12 +528,16 @@ typedef struct
 		DPB_QUAKE2
 #endif
 	}	demoplayback, demorecording;
+	unsigned int demoeztv_ext;
+		#define EZTV_DOWNLOAD		(1u<<0)	//also changes modellist/soundlist stuff to keep things synced
+		#define EZTV_SETINFO		(1u<<1)	//proxy wants setinfo + ptrack commands
+		#define EZTV_QTVUSERLIST	(1u<<2)	//'//qul cmd id [name]' commands from proxy.
 	qboolean	demohadkeyframe;	//q2 needs to wait for a packet with a key frame, supposedly.
 	qboolean	demoseeking;
 	float		demoseektime;
 	int			demotrack;
 	qboolean	timedemo;
-	char		lastdemoname[MAX_OSPATH];
+	char		lastdemoname[MAX_OSPATH];	//empty if is a qtv stream
 	qboolean	lastdemowassystempath;
 	vfsfile_t	*demoinfile;
 	float		td_lastframe;		// to meter out one message a frame
@@ -540,6 +545,13 @@ typedef struct
 	float		td_starttime;		// realtime at second frame of timedemo
 	float		demostarttime;		// the time of the first frame, so we don't get weird results with qw demos
 
+	struct qtvviewers_s
+	{	//(other) people on a qtv. in case people give a damn.
+		struct qtvviewers_s *next;
+		int			userid;
+		char		name[128];
+	} *qtvviewers;
+
 	int			challenge;
 
 	float		latency;		// rolling average
@@ -904,12 +916,12 @@ typedef struct
 // information that is static for the entire time connected to a server
 //
 #ifdef HAVE_LEGACY
-	char				model_name_vwep[MAX_VWEP_MODELS][MAX_QPATH];
+	char				*model_name_vwep[MAX_VWEP_MODELS];
 	struct model_s		*model_precache_vwep[MAX_VWEP_MODELS];
 #endif
-	char				model_name[MAX_PRECACHE_MODELS][MAX_QPATH];
+	char				*model_name[MAX_PRECACHE_MODELS];
 	struct model_s		*model_precache[MAX_PRECACHE_MODELS];
-	char				sound_name[MAX_PRECACHE_SOUNDS][MAX_QPATH];
+	char				*sound_name[MAX_PRECACHE_SOUNDS];
 	struct sfx_s		*sound_precache[MAX_PRECACHE_SOUNDS];
 	char				*particle_ssname[MAX_SSPARTICLESPRE];
 	int					particle_ssprecache[MAX_SSPARTICLESPRE];	//these are actually 1-based, so 0 can be used to lazy-init them. I cheat.
@@ -994,6 +1006,8 @@ typedef struct
 	float				currentpacktime;
 	qboolean			do_lerp_players;
 
+	playerview_t		*mouseplayerview;	//for mouse/scoreboard interaction when playing mvds.
+	int					mousenewtrackplayer;
 
 	int teamplay;
 	int deathmatch;
@@ -1363,6 +1377,7 @@ void CL_Parse_Disconnected(void);
 void CL_DumpPacket(void);
 void CL_ParseEstablished(void);
 void CLQW_ParseServerMessage (void);
+void CLEZ_ParseHiddenDemoMessage (void);
 void CLNQ_ParseServerMessage (void);
 #ifdef Q2CLIENT
 void CLQ2_ParseServerMessage (void);
diff --git a/engine/client/console.c b/engine/client/console.c
index 94c84af44..b19ca2cba 100644
--- a/engine/client/console.c
+++ b/engine/client/console.c
@@ -1956,7 +1956,8 @@ static int Con_DrawProgress(int left, int right, int y)
 				sprintf(progresspercenttext, " (%ukB/s)", CL_DownloadRate()/1000);
 			else
 			{
-				sprintf(progresspercenttext, " (%u%sKiB)", (int)(total/1024), extra?"+":"");
+				char tmp[64];
+				sprintf(progresspercenttext, " (%s%s)", FS_AbbreviateSize(tmp,sizeof(tmp), total), extra?"+":"");
 			}
 
 			//do some marquee thing, so the user gets the impression that SOMETHING is happening.
diff --git a/engine/client/image.c b/engine/client/image.c
index deaa5e2ca..092cf2e72 100644
--- a/engine/client/image.c
+++ b/engine/client/image.c
@@ -1792,7 +1792,7 @@ error:
 
 int Image_WritePNG (const char *filename, enum fs_relative fsroot, int compression, void **buffers, int numbuffers, qintptr_t bufferstride, int width, int height, enum uploadfmt fmt, qboolean writemetadata)
 {
-	char name[MAX_OSPATH];
+	char systemname[MAX_OSPATH];	//FIXME: replace with png_set_write_fn
 	int i;
 	FILE *fp;
 	png_structp png_ptr;
@@ -1882,7 +1882,7 @@ int Image_WritePNG (const char *filename, enum fs_relative fsroot, int compressi
 	}
 	Image_BlockSizeForEncoding(fmt, &pxsize, &bw, &bh, &bd);
 
-	if (!FS_NativePath(filename, fsroot, name, sizeof(name)))
+	if (!FS_SystemPath(filename, fsroot, systemname, sizeof(systemname)))
 		return false;
 
 	if (numbuffers == 2)
@@ -1898,10 +1898,10 @@ int Image_WritePNG (const char *filename, enum fs_relative fsroot, int compressi
 	if (!LibPNG_Init())
 		return false;
 
-	if (!(fp = fopen (name, "wb")))
+	if (!(fp = fopen (systemname, "wb")))
 	{
-		FS_CreatePath (filename, FS_GAMEONLY);
-		if (!(fp = fopen (name, "wb")))
+		FS_CreatePath (systemname, FS_SYSTEM);
+		if (!(fp = fopen (systemname, "wb")))
 			return false;
 	}
 
@@ -7176,6 +7176,7 @@ static struct pendingtextureinfo *Image_ReadBLPFile(unsigned int flags, const ch
 //This is for the version command
 void Image_PrintInputFormatVersions(void)
 {
+	int i;
 #ifndef S_COLOR_YELLOW
 	#define S_COLOR_YELLOW ""
 	#define S_COLOR_WHITE ""
@@ -7185,6 +7186,9 @@ void Image_PrintInputFormatVersions(void)
 
 	#ifdef IMAGEFMT_DDS
 		Con_Printf(" dds");
+		#ifndef DECOMPRESS_S3TC
+			Con_Printf("(hw-only)");
+		#endif
 	#endif
 	#ifdef IMAGEFMT_KTX
 		Con_Printf(" ktx");
@@ -7231,6 +7235,9 @@ void Image_PrintInputFormatVersions(void)
 	#endif
 	#ifdef IMAGEFMT_ASTC
 		Con_Printf(" astc");
+		#ifndef DECOMPRESS_ASTC
+			Con_Printf("(hw-only)");
+		#endif
 	#endif
 	#ifdef IMAGEFMT_PKM
 		Con_Printf(" pkm");
@@ -7278,6 +7285,10 @@ void Image_PrintInputFormatVersions(void)
 		Con_Printf(" lmp");
 	#endif
 
+	//now properly registered ones.
+	for (i = 0; i < imageloader_count;  i++)
+		Con_Printf(" ^[%s^]", imageloader[i].funcs->loadername);
+
 	Con_Printf("\n");
 }
 
@@ -13757,10 +13768,10 @@ qboolean Image_LocateHighResTexture(image_t *tex, flocation_t *bestloc, char *be
 		{
 			COM_FileExtension(altname, nicename, sizeof(nicename));
 			e = 0;
-			if (strcmp(nicename, "lmp") && strcmp(nicename, "wal"))
+			if (Q_strcasecmp(nicename, "lmp") && Q_strcasecmp(nicename, "wal"))
 				for (; e < tex_extensions_count; e++)
 				{
-					if (!strcmp(nicename, (*tex_extensions[e].name=='.')?tex_extensions[e].name+1:tex_extensions[e].name))
+					if (!Q_strcasecmp(nicename, (*tex_extensions[e].name=='.')?tex_extensions[e].name+1:tex_extensions[e].name))
 						break;
 				}
 		}
@@ -13844,7 +13855,7 @@ qboolean Image_LocateHighResTexture(image_t *tex, flocation_t *bestloc, char *be
 						for (e = firstex; e < tex_extensions_count; e++)
 						{
 							if (tex->flags & IF_NOPCX)
-								if (!strcmp(tex_extensions[e].name, ".pcx"))
+								if (!Q_strcasecmp(tex_extensions[e].name, ".pcx"))
 									continue;
 							Q_snprintfz(fname, sizeof(fname), tex_path[i].path, subpath, basename, tex_extensions[e].name);
 							depth = FS_FLocateFile(fname, locflags, &loc);
@@ -13863,7 +13874,7 @@ qboolean Image_LocateHighResTexture(image_t *tex, flocation_t *bestloc, char *be
 					for (e = firstex; e < tex_extensions_count; e++)
 					{
 						if (tex->flags & IF_NOPCX)
-							if (!strcmp(tex_extensions[e].name, ".pcx"))
+							if (!Q_strcasecmp(tex_extensions[e].name, ".pcx"))
 								continue;
 						Q_snprintfz(fname, sizeof(fname), tex_path[i].path, nicename, tex_extensions[e].name);
 						depth = FS_FLocateFile(fname, locflags, &loc);
@@ -13906,7 +13917,7 @@ qboolean Image_LocateHighResTexture(image_t *tex, flocation_t *bestloc, char *be
 						*b = 0;
 						for (e = firstex; e < tex_extensions_count; e++)
 						{
-							if (!strcmp(tex_extensions[e].name, ".tga"))
+							if (!Q_strcasecmp(tex_extensions[e].name, ".tga"))
 							{
 								Q_snprintfz(fname, sizeof(fname), tex_path[i].path, bumpname, tex_extensions[e].name);
 								depth = FS_FLocateFile(fname, locflags, &loc);
@@ -14747,7 +14758,10 @@ void Image_Formats_f(void)
 		}
 		Image_BlockSizeForEncoding(i, &blockbytes, &blockwidth, &blockheight, &blockdepth);
 		bpp = blockbytes*8.0/(blockwidth*blockheight*blockdepth);
-		Con_Printf("%20s: %s"S_COLOR_GRAY" (%s%.3g-bpp)\n", Image_FormatName(i), sh_config.texfmt[i]?S_COLOR_GREEN"Enabled":S_COLOR_RED"Disabled", (blockdepth!=1)?"3d, ":"", bpp);
+		if (blockbytes)
+			Con_Printf("%20s: %s"S_COLOR_GRAY" (%s%.3g-bpp)\n", Image_FormatName(i), sh_config.texfmt[i]?S_COLOR_GREEN"Enabled":S_COLOR_RED"Disabled", (blockdepth!=1)?"3d, ":"", bpp);
+		else
+			Con_Printf("%20s: %s\n", Image_FormatName(i), sh_config.texfmt[i]?S_COLOR_GREEN"Enabled":S_COLOR_RED"Disabled");
 	}
 }
 
diff --git a/engine/client/in_generic.c b/engine/client/in_generic.c
index fd6f1ae7c..20977da08 100644
--- a/engine/client/in_generic.c
+++ b/engine/client/in_generic.c
@@ -491,7 +491,7 @@ void IN_Commands(void)
 			Key_Event(ev->devid, ev->keyboard.scancode, ev->keyboard.unicode, true);
 			break;
 		case IEV_JOYAXIS:
-			if (ev->devid < MAXJOYSTICKS && ev->joy.axis < MAXJOYAXIS)
+			if (ev->devid < MAXJOYSTICKS && ev->joy.axis>=0 && ev->joy.axis<MAXJOYAXIS)
 			{
 				if (topmenu && topmenu->joyaxis && topmenu->joyaxis(topmenu, ev->devid, ev->joy.axis, ev->joy.value))
 					joy[ev->devid].axis[ev->joy.axis] = 0;
@@ -884,6 +884,9 @@ void IN_MoveMouse(struct mouse_s *mouse, float *movements, int pnum, float frame
 		return;
 	}
 
+	if (r_xflip.ival)
+		mouse_x *= -1;
+
 // add mouse X/Y movement to cmd
 	if (strafe_x)
 		movements[1] += m_side.value * mouse_x;
@@ -1040,6 +1043,8 @@ void IN_MoveJoystick(struct joy_s *joy, float *movements, int pnum, float framet
 		VectorClear(jlook);
 		VectorClear(jstrafe);
 	}
+	if (r_xflip.ival)
+		jlook[0] *= -1, jstrafe[0] *= -1;
 
 	if (in_speed.state[pnum] & 1)
 	{
diff --git a/engine/client/in_sdl.c b/engine/client/in_sdl.c
index 617d6ce30..14c43b7fa 100644
--- a/engine/client/in_sdl.c
+++ b/engine/client/in_sdl.c
@@ -394,6 +394,44 @@ static void J_JoystickButton(SDL_JoystickID jid, int button, qboolean pressed)
 	}
 }
 
+int INS_GetControllerType(int id)
+{
+#if SDL_VERSION_ATLEAST(2,0,12)
+	int i;
+	for (i = 0; i < MAX_JOYSTICKS; i++)
+	{
+		if (sdljoy[i].qdevid == id)
+		{
+			switch(SDL_GameControllerTypeForIndex(sdljoy[i].id))
+			{
+			default:	//for the future...
+#if SDL_VERSION_ATLEAST(2,0,14)
+			case SDL_CONTROLLER_TYPE_VIRTUAL:	//don't really know... assume steaminput and thus steamdeck and thus xbox-like.
+#endif
+				return 1;
+			case SDL_CONTROLLER_TYPE_UNKNOWN:
+				return 0;
+			case SDL_CONTROLLER_TYPE_XBOX360:
+			case SDL_CONTROLLER_TYPE_XBOXONE:
+#if SDL_VERSION_ATLEAST(2,0,16)
+			case SDL_CONTROLLER_TYPE_GOOGLE_STADIA:	//close enough
+			case SDL_CONTROLLER_TYPE_AMAZON_LUNA:	//it'll do. I guess we're starting to see a standard here.
+#endif
+				return 1;	//a on bottom, b('cancel') to right
+			case SDL_CONTROLLER_TYPE_PS3:
+			case SDL_CONTROLLER_TYPE_PS4:
+#if SDL_VERSION_ATLEAST(2,0,14)
+			case SDL_CONTROLLER_TYPE_PS5:
+#endif
+				return 2;	//weird indecipherable shapes.
+			case SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO:
+				return 3;	//b on bottom, a('cancel') to right
+			}
+		}
+	}
+#endif
+	return 0;
+}
 void INS_Rumble(int id, quint16_t amp_low, quint16_t amp_high, quint32_t duration)
 {
 #if SDL_VERSION_ATLEAST(2,0,9)
@@ -459,7 +497,8 @@ void INS_SetLEDColor(int id, vec3_t color)
 void INS_SetTriggerFX(int id, const void *data, size_t size)
 {
 #if SDL_VERSION_ATLEAST(2,0,15)
-	for (int i = 0; i < MAX_JOYSTICKS; i++)
+	int i;
+	for (i = 0; i < MAX_JOYSTICKS; i++)
 	{
 		if (sdljoy[i].qdevid == id)
 		{
diff --git a/engine/client/in_win.c b/engine/client/in_win.c
index 1086274f5..ec5bfaa3e 100644
--- a/engine/client/in_win.c
+++ b/engine/client/in_win.c
@@ -34,8 +34,6 @@ void INS_Accumulate (void);
 
 #define AVAIL_XINPUT
 #ifdef AVAIL_XINPUT
-//#define AVAIL_XINPUT_DLL "xinput9_1_0.dll"
-#define AVAIL_XINPUT_DLL "xinput1_3.dll"
 typedef struct _XINPUT_GAMEPAD {
 	WORD  wButtons;
 	BYTE  bLeftTrigger;
@@ -55,7 +53,9 @@ typedef struct _XINPUT_VIBRATION {
 } XINPUT_VIBRATION, *PXINPUT_VIBRATION;
 DWORD (WINAPI *pXInputGetState)(DWORD dwUserIndex, XINPUT_STATE *pState);
 DWORD (WINAPI *pXInputSetState)(DWORD dwUserIndex, XINPUT_VIBRATION *pState);
-DWORD (WINAPI *pXInputGetDSoundAudioDeviceGuids)(DWORD dwUserIndex, GUID* pDSoundRenderGuid, GUID* pDSoundCaptureGuid);
+DWORD (WINAPI *pXInputGetDSoundAudioDeviceGuids)(DWORD dwUserIndex, GUID* pDSoundRenderGuid, GUID* pDSoundCaptureGuid);	//xi 1.3
+DWORD (WINAPI *pXInputGetAudioDeviceIds)(DWORD dwUserIndex, LPWSTR pRenderDeviceId, UINT *pRenderCount, LPWSTR pCaptureDeviceId, UINT *pCaptureCount); //xi 1.4
+
 enum
 {
 	XINPUT_GAMEPAD_DPAD_UP			= 0x0001,
@@ -382,6 +382,51 @@ static const int mmjbuttons[32] =
 	K_JOY8
 };
 
+
+static HANDLE	powercontext = INVALID_HANDLE_VALUE;
+static qboolean	powersaveblocked = false;
+static HANDLE	(WINAPI *pPowerCreateRequest)	(REASON_CONTEXT *Context);
+static BOOL		(WINAPI *pPowerSetRequest)		(HANDLE Context,	POWER_REQUEST_TYPE RequestType);
+static BOOL		(WINAPI *pPowerClearRequest)	(HANDLE Context,	POWER_REQUEST_TYPE RequestType);
+static void INS_ScreenSaver_Init(void)
+{
+	dllfunction_t functable[] =
+	{
+		{(void*)&pPowerCreateRequest,	"PowerCreateRequest"},
+		{(void*)&pPowerSetRequest,		"PowerSetRequest"},
+		{(void*)&pPowerClearRequest,	"PowerClearRequest"},
+		{NULL}
+	};
+
+	if (Sys_LoadLibrary("kernel32.dll", functable))
+	{	//we don't do microsoft's interpretation of localisation, so this is lame.
+		REASON_CONTEXT reason = {POWER_REQUEST_CONTEXT_VERSION, POWER_REQUEST_CONTEXT_SIMPLE_STRING};
+		reason.Reason.SimpleReasonString = L"Demo Playback";
+		powercontext = pPowerCreateRequest(&reason);
+
+		//FIXME: be prepared to regenerate the reason when our lang changes...
+	}
+}
+static void INS_ScreenSaver_UpdateBlock(qboolean block)
+{
+	if (powercontext != INVALID_HANDLE_VALUE && block != powersaveblocked)
+	{
+		powersaveblocked = block;
+		if (block)
+		{
+			pPowerSetRequest(powercontext, PowerRequestDisplayRequired);	//keep the screen on...
+			pPowerSetRequest(powercontext, PowerRequestSystemRequired);		//and don't go to sleep mid-video, too...
+		}
+		else
+		{
+			pPowerClearRequest(powercontext, PowerRequestSystemRequired);
+			pPowerClearRequest(powercontext, PowerRequestDisplayRequired);
+		}
+	}
+}
+
+
+
 // forward-referenced functions
 void INS_StartupJoystick (void);
 void INS_JoyMove (void);
@@ -706,6 +751,8 @@ void INS_UpdateGrabs(int fullscreen, int activeapp)
 {
 	int grabmouse;
 
+	INS_ScreenSaver_UpdateBlock(cls.demoplayback && activeapp);
+
 	if (!activeapp)
 		grabmouse = false;
 	else if (fullscreen || in_simulatemultitouch.ival || in_windowed_mouse.value)
@@ -1376,6 +1423,8 @@ void INS_Init (void)
 	Cvar_Register (&in_rawinput_keyboard, "Input Controls");
 	Cvar_Register (&in_rawinput_rdp, "Input Controls");
 #endif
+
+	INS_ScreenSaver_Init();
 }
 
 /*
@@ -1854,16 +1903,29 @@ static void IN_XInput_SetupAudio(struct wjoy_s *joy)
 	if (joy->devid == DEVID_UNSET)
 		return;
 
-	if (pXInputGetDSoundAudioDeviceGuids(joy->id, &gplayback, &gcapture) != ERROR_SUCCESS)
-		return;	//probably not plugged in
+	if (pXInputGetDSoundAudioDeviceGuids)
+	{
+		if (pXInputGetDSoundAudioDeviceGuids(joy->id, &gplayback, &gcapture) != ERROR_SUCCESS)
+			return;	//probably not plugged in
 
-	if (!memcmp(&gplayback, &GUID_NULL, sizeof(gplayback)))
-		return;	//we have a controller, but no headset.
+		if (!memcmp(&gplayback, &GUID_NULL, sizeof(gplayback)))
+			return;	//we have a controller, but no headset.
 
-	StringFromGUID2(&gplayback, mssuck, sizeof(mssuck)/sizeof(mssuck[0]));
-	narrowen(audiodevicename, sizeof(audiodevicename), mssuck);
-	Con_Printf("Controller %i uses audio device %s\n", joy->id, audiodevicename);
-	joy->audiodev = S_SetupDeviceSeat("DirectSound", audiodevicename, joy->devid);
+		StringFromGUID2(&gplayback, mssuck, sizeof(mssuck)/sizeof(mssuck[0]));
+		narrowen(audiodevicename, sizeof(audiodevicename), mssuck);
+		Con_Printf("Controller %i uses directsound device %s\n", joy->id, audiodevicename);
+		joy->audiodev = S_SetupDeviceSeat("DirectSound", audiodevicename, joy->devid);
+	}
+	else if (pXInputGetAudioDeviceIds)
+	{
+		UINT wccount = countof(mssuck);
+		if (!FAILED(pXInputGetAudioDeviceIds(joy->id, mssuck, &wccount, NULL,NULL/*we don't have separate mics, sadly, which also makes config awkward*/)))
+		{
+	        narrowen(audiodevicename, sizeof(audiodevicename), mssuck);
+			Con_Printf("Controller %i uses xaudio2 device %s\n", joy->id, audiodevicename);
+			joy->audiodev = S_SetupDeviceSeat("XAudio2", audiodevicename, joy->devid);
+		}
+	}
 #endif
 }
 void INS_SetupControllerAudioDevices(qboolean enabled)
@@ -1871,9 +1933,6 @@ void INS_SetupControllerAudioDevices(qboolean enabled)
 #ifdef AVAIL_XINPUT
 	int i;
 
-	if (!pXInputGetDSoundAudioDeviceGuids)
-		return;
-
 	xinput_useaudio = enabled;
 	for (i = 0; i < joy_count; i++)
 		IN_XInput_SetupAudio(&wjoy[i]);
@@ -1891,6 +1950,12 @@ void INS_StartupJoystick (void)
 	if (in_xinput.ival)
 	{
 		static dllhandle_t *xinput;
+		static const char *dllnames[] =
+		{
+			"xinput1_4.dll",	//win8+ only. does xaudio2 instead of dsound.
+			"xinput1_3.dll",	//dxsdk (vista+). does dsound stuff.
+			"xinput9_1_0.dll"	//vista+. doesn't do audio stuff.
+		};
 		if (!xinput)
 		{
 			dllfunction_t funcs[] =
@@ -1899,10 +1964,17 @@ void INS_StartupJoystick (void)
 				{(void**)&pXInputSetState, "XInputSetState"},
 				{NULL}
 			};
-			xinput = Sys_LoadLibrary(AVAIL_XINPUT_DLL, funcs);
+			pXInputGetDSoundAudioDeviceGuids = NULL;
+			pXInputGetAudioDeviceIds = NULL;
+			for (id = 0; id < countof(dllnames); id++)
+			{
+				xinput = Sys_LoadLibrary(dllnames[id], funcs);
+				if (xinput)
+					break;
+			}
 
-			if (xinput)
-				pXInputGetDSoundAudioDeviceGuids = Sys_GetAddressForName(xinput, "XInputGetDSoundAudioDeviceGuids");
+			pXInputGetDSoundAudioDeviceGuids = xinput?Sys_GetAddressForName(xinput, "XInputGetDSoundAudioDeviceGuids"):NULL;
+			pXInputGetAudioDeviceIds = xinput?Sys_GetAddressForName(xinput, "XInputGetAudioDeviceIds"):NULL;
 		}
 		if (pXInputGetState)
 		{
@@ -1925,7 +1997,7 @@ void INS_StartupJoystick (void)
 			Con_DPrintf("XInput is enabled (%i controllers found)\n", numdevs);
 		}
 		else
-			Con_Printf("XInput not installed\n");
+			Con_Printf("XInput (%s) not installed\n", dllnames[1]);
 	}
 #endif
 
diff --git a/engine/client/keys.c b/engine/client/keys.c
index c4ce80113..c70f82769 100644
--- a/engine/client/keys.c
+++ b/engine/client/keys.c
@@ -944,7 +944,7 @@ void Key_DefaultLinkClicked(console_t *con, char *text, char *info)
 			if (*cl.players[player].ip)
 				Con_Footerf(con, true, "\n%s", cl.players[player].ip);
 
-			if (cl.playerview[0].spectator || cls.demoplayback==DPB_MVD||cls.demoplayback==DPB_EZTV)
+			if (cl.playerview[0].spectator || cls.demoplayback==DPB_MVD)
 			{
 				//we're spectating, or an mvd
 				Con_Footerf(con, true, " ^[Spectate\\player\\%i\\action\\spec^]", player);
@@ -3079,7 +3079,7 @@ void Key_Event (unsigned int devid, int key, unsigned int unicode, qboolean down
 //
 // during demo playback, most keys bring up the main menu
 //
-	if (cls.demoplayback && cls.demoplayback != DPB_MVD && cls.demoplayback != DPB_EZTV && conkey && !Key_Dest_Has(~kdm_game))
+	if (cls.demoplayback && cls.demoplayback != DPB_MVD && conkey && !Key_Dest_Has(~kdm_game))
 	{
 		switch (key)
 		{	//these keys don't force the menu to appear while playing the demo reel
@@ -3243,6 +3243,8 @@ defaultedbind:
 	if (key == K_TOUCH || (key == K_MOUSE1 && IN_Touch_MouseIsAbs(devid)))
 	{
 		const char *button = SCR_ShowPics_ClickCommand(mousecursor_x, mousecursor_y, key == K_TOUCH);
+		if (!button && cl.mouseplayerview && cl.mousenewtrackplayer>=0)
+			Cam_Lock(cl.mouseplayerview, cl.mousenewtrackplayer);
 		if (button)
 		{
 			dc = button;
diff --git a/engine/client/m_download.c b/engine/client/m_download.c
index 7b207319a..1816ad84c 100644
--- a/engine/client/m_download.c
+++ b/engine/client/m_download.c
@@ -368,7 +368,7 @@ static qboolean PM_HasDep(package_t *p, int deptype, const char *depname)
 	//no dupes.
 	for (d = p->deps; d ; d = d->next)
 	{
-		if (d->dtype == deptype && !strcmp(d->name, depname))
+		if (d->dtype == deptype && (!depname || !strcmp(d->name, depname)))
 			return true;
 	}
 	return false;
@@ -561,7 +561,7 @@ static void PM_ValidatePackage(package_t *p)
 			else
 				continue;
 			if (!(p->flags & (DPF_NATIVE|DPF_CACHED)))
-				Con_Printf("WARNING: %s (%s) no longer exists\n", p->name, n);
+				Con_Printf("WARNING: (%i) %s (%s) no longer exists\n", dep->dtype, p->name, n);
 		}
 
 		//if no files were present, unmark it.
@@ -637,7 +637,7 @@ static void PM_ValidatePackage(package_t *p)
 						{
 							unsigned int fqhash;
 							pf = NULL;
-							fqhash = archive->GeneratePureCRC(archive, 0, 0);
+							fqhash = archive->GeneratePureCRC(archive, NULL);
 							archive->ClosePath(archive);
 
 							if (fqhash == (unsigned int)strtoul(p->qhash, NULL, 0))
@@ -833,7 +833,7 @@ static package_t *PM_InsertPackage(package_t *p)
 	package_t **link;
 	int v;
 
-	for (link = &availablepackages; *link; link = &(*link)->next)
+	for (link = &availablepackages; *link; )
 	{
 		package_t *prev = *link;
 		if (((prev->flags|p->flags) & DPF_GUESSED) && prev->extract == p->extract && !strcmp(prev->gamedir, p->gamedir) && prev->fsroot == p->fsroot && !strcmp(prev->qhash?prev->qhash:"", p->qhash?p->qhash:""))
@@ -858,16 +858,21 @@ static package_t *PM_InsertPackage(package_t *p)
 				break;
 			}
 			if (differs)
+			{
+				link = &(*link)->next;
 				continue;
+			}
 			else
 			{
-				if (p->flags & DPF_GUESSED)
-				{	//the new one was guessed. just return the existing package instead.
+				if ((p->flags & DPF_GUESSED) && (prev->flags & DPF_PRESENT))
+				{	//the new one was also guessed. just return the existing package instead.
+					prev->flags |= p->flags&(DPF_PRESENT|DPF_ALLMARKED|DPF_ENABLED);
 					PM_FreePackage(p);
 					return prev;
 				}
-
-				//FIXME: replace prev...
+				PM_FreePackage(prev);
+				link = &availablepackages;
+				continue;
 			}
 		}
 		v = PM_PackageSortOrdering(&prev, &p);
@@ -891,13 +896,19 @@ static package_t *PM_InsertPackage(package_t *p)
 				p->next = prev->alternative;
 				prev->alternative = p;
 				p->link = &prev->alternative;
-				return prev;
+				if (p->next)
+					p->next->link = &p->next;
+				return p;
 			}
 
 			//something major differs, display both independantly.
 			p->flags |= DPF_DISPLAYVERSION;
 			prev->flags |= DPF_DISPLAYVERSION;
+
+			//there might be more such dupes.
 		}
+
+		link = &(*link)->next;
 	}
 	PM_ValidatePackage(p);
 
@@ -919,6 +930,7 @@ static package_t *PM_InsertPackage(package_t *p)
 	p->link = link;
 	*link = p;
 	numpackages++;
+
 	return p;
 }
 
@@ -1017,7 +1029,13 @@ static void PM_AddSubListModule(void *module, plugupdatesourcefuncs_t *funcs, co
 				Z_Free(pm_source[i].prefix);
 				pm_source[i].prefix = Z_StrDup(prefix);
 			}
+			pm_source[i].flags &= ~SRCFL_HISTORIC;
 			pm_source[i].flags |= flags & SRCFL_UNSAFE;
+			if ((flags & SRCFL_USER) && (flags & (SRCFL_ENABLED|SRCFL_DISABLED)))
+			{
+				pm_source[i].flags &= ~SRCFL_ENABLED|SRCFL_DISABLED;
+				pm_source[i].flags |= (SRCFL_ENABLED|SRCFL_DISABLED) & flags;
+			}
 			break;
 		}
 	}
@@ -1062,11 +1080,15 @@ static void PM_RemSubList(const char *url)
 			//don't actually remove it, that'd mess up the indexes which could break stuff like PM_ListDownloaded callbacks. :(
 			pm_source[i].flags = SRCFL_HISTORIC;	//forget enablement state etc. we won't bother writing it.
 			pm_sequence++;	//make sure any menus hide it.
-			break;
+
+			Con_Printf("Source %s removed\n", url);
+			return;
 		}
 		else
 			i++;
 	}
+
+	Con_Printf("Source %s not known, cannot remove\n", url);
 }
 #endif
 
@@ -1083,7 +1105,7 @@ struct packagesourceinfo_s
 	char mirror[MAXMIRRORS][MAX_OSPATH];
 	int nummirrors;
 };
-static const char *PM_ParsePackage(struct packagesourceinfo_s *source, const char *tokstart, package_t **outpackage, int wantvariation)
+static const char *PM_ParsePackage(struct packagesourceinfo_s *source, const char *tokstart, package_t **outpackage, int wantvariation, const char *defaultpkgname)
 {
 	package_t *p;
 	struct packagedep_s *dep;
@@ -1095,12 +1117,11 @@ static const char *PM_ParsePackage(struct packagesourceinfo_s *source, const cha
 
 	{
 		char pathname[256];
-		char *fullname = (source->version >= 3)?NULL:Z_StrDup(com_token);
+		char *fullname = defaultpkgname?Z_StrDup(defaultpkgname):NULL;
 		char *file = NULL;
 		char *url = NULL;
 		char *category = NULL;
 		unsigned int flags = source->parseflags;
-		int i;
 
 		if (source->version > 2)	//v3 has an 'installed' token to say its enabled. v2 has a 'stale' token to say its old, which was weird and to try to avoid conflicts.
 			flags &= ~DPF_ENABLED;
@@ -1110,7 +1131,7 @@ static const char *PM_ParsePackage(struct packagesourceinfo_s *source, const cha
 		p->priority = PM_DEFAULTPRIORITY;
 		p->fsroot = FS_ROOT;
 		Q_strncpyz(p->gamedir, source->gamedir, sizeof(p->gamedir));
-		for (i = 1; tokstart; i++)
+		while (tokstart)
 		{
 			char *eq;
 			char key[8192];
@@ -1240,7 +1261,7 @@ static const char *PM_ParsePackage(struct packagesourceinfo_s *source, const cha
 			}
 			else if (!strcmp(key, "map"))
 				PM_AddDep(p, DEP_MAP, val);
-			else if (!strcmp(key, "depend"))
+			else if (!strcmp(key, "depend") || !strcmp(key, "depends"))
 				PM_AddDep(p, DEP_REQUIRE, val);
 			else if (!strcmp(key, "conflict"))
 				PM_AddDep(p, DEP_CONFLICT, val);
@@ -1329,7 +1350,7 @@ static const char *PM_ParsePackage(struct packagesourceinfo_s *source, const cha
 		{
 			p->mirror[0] = Z_StrDup(url);
 
-			if (!file)
+			if (!file && p->extract != EXTRACT_ZIP)
 			{
 				FS_PathURLCache(url, pathname, sizeof(pathname));
 				PM_AddDep(p, DEP_CACHEFILE, pathname+10);
@@ -1413,7 +1434,7 @@ static const char *PM_ParsePackage(struct packagesourceinfo_s *source, const cha
 		if (wantvariation == 0)	//only the first!
 		{
 			while (++wantvariation < variation)
-				if (tokstart != PM_ParsePackage(source, start, NULL, wantvariation))
+				if (tokstart != PM_ParsePackage(source, start, NULL, wantvariation, defaultpkgname))
 				{
 					Con_Printf(CON_ERROR"%s: Unable to parse package variation...\n", source->url);
 					break;	//erk?
@@ -1657,13 +1678,13 @@ static qboolean PM_ParsePackageList(const char *f, unsigned int parseflags, cons
 			if (!strcmp(com_token, "{"))
 			{
 				linestart = COM_StringParse (linestart, com_token, sizeof(com_token), false, false);
-				f = PM_ParsePackage(&source, linestart, NULL, 0);
+				f = PM_ParsePackage(&source, linestart, NULL, 0, NULL);
 				if (!f)
 					break;	//erk!
 			}
 			else if (source.version < 3)
 			{	//old single-line gibberish
-				PM_ParsePackage(&source, tokstart, NULL, -1);
+				PM_ParsePackage(&source, tokstart, NULL, -1, com_token);
 			}
 			else
 			{
@@ -1765,6 +1786,7 @@ static char *PM_GetMetaTextFromFile(vfsfile_t *file, const char *filename, char
 	archive = FS_OpenPackByExtension(file, NULL, filename, filename, "");
 	if (archive)
 	{
+		int crc;
 		flocation_t loc;
 		vfsfile_t *metafile = NULL;
 		if (archive->FindFile(archive, &loc, "fte.meta", NULL))
@@ -1775,13 +1797,69 @@ static char *PM_GetMetaTextFromFile(vfsfile_t *file, const char *filename, char
 		{
 			size_t sz = VFS_GETLEN(metafile);
 			ret = BZ_Malloc(sz+1);
-			VFS_READ(metafile, ret, sz);
-			ret[sz] = 0;
+			if (ret)
+			{
+				VFS_READ(metafile, ret, sz);
+				ret[sz] = 0;
+			}
 			VFS_CLOSE(metafile);
 		}
+		crc = archive->GeneratePureCRC(archive, NULL);
+
+		if (!ret)
+		{	//it'd be really nice if creators were embedding metadata into their packages... but creators suck... especially when their creations predate our engine...
+			//anyway, we kinda need this stuff in order to get the gamedirs right when drag+dropping. we also get nicer titles out of it.
+#ifdef HAVE_LEGACY
+			if (0)
+				;
+			//quake
+			else if (crc == 0x92c8b832 && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake_shareware\ntitle \"Quake Shareware Data\"\ngamedir id1\nver 1.01\n}\n");
+			else if (crc == 0x4f069cac && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake_shareware\ntitle \"Quake Shareware Data\"\ngamedir id1\nver 1.06\n}\n");
+			else if (crc == 0x329050a6 && !Q_strcasecmp(filename, "pak1.pak"))	ret = Z_StrDup("{\npackage quake_registered\ntitle \"Quake Registered Data\"\ngamedir id1\n}\n");
+			else if (crc == 0x31bef951 && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake_hipnotic\ntitle \"Scourge of Armagon\"\ngamedir hipnotic\n}\n");
+			else if (crc == 0x799d60c0 && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake_rogue\ntitle \"Dissolution of Eternity\"\ngamedir rogue\n}\n");
+			//quake rerelease
+			else if (crc == 0xefdb8a92 && !Q_strcasecmp(filename, "QuakeEX.kpf"))ret= Z_StrDup("{\npackage quakeex_data\ntitle \"Quake Rerelease Misc Data\"\ngamedir \"\"\n}\n");	//p4
+			else if (crc == 0xbb51cd43 && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake_rerel\ntitle \"Quake Rerelease Data\"\ngamedir id1\nrequire quakeex_data\n}\n");	//p4
+			else if (crc == 0xda8e9bb8 && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake_rerel_hipnotic\ntitle \"Scourge of Armagon (Rerelease)\"\ngamedir hipnotic\nrequire quakeex_data\n}\n");
+			else if (crc == 0x016eac0c && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake_rerel_rogue\ntitle \"Dissolution of Eternity (Rerelease)\"\ngamedir rogue\nrequire quakeex_data\n}\n");
+			else if (crc == 0xbdfb74e2 && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake_rerel_ctf\ntitle \"Capture The Flag (Rerelease)\"\ngamedir ctf\nrequire quakeex_data\n}\n");
+			else if (crc == 0x8751abb3 && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake_rerel_dopa\ntitle \"Dimensions Of The Past (Rerelease)\"\ngamedir dopa\nrequire quakeex_data\n}\n");
+			else if (crc == 0x73f34d24 && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake_rerel_mg1\ntitle \"Dimensions Of The Machine\"\ngamedir mg1\nrequire quakeex_data\n}\n");
+			//hexen2
+			else if (crc == 0xae67217a && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage hexen2_registered_p0\ntitle \"Quake2 Data (pak0)\"\ngamedir data1\n}\n");
+			else if (crc == 0xee6fabd1 && !Q_strcasecmp(filename, "pak1.pak"))	ret = Z_StrDup("{\npackage hexen2_registered_p1\ntitle \"Quake2 Data (pak1)\"\ngamedir data1\n}\n");
+			else if (crc == 0x400848b4 && !Q_strcasecmp(filename, "pak3.pak"))	ret = Z_StrDup("{\npackage hexen2_portals\ntitle \"Portals Data\"\ngamedir portals\n}\n");
+			//quake2
+			else if (crc == 0x03ffdce0 && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake2_p0\ntitle \"Quake2 Data (pak0)\"\ngamedir baseq2\n}\n");
+			else if (crc == 0x7d40ac55 && !Q_strcasecmp(filename, "pak1.pak"))	ret = Z_StrDup("{\npackage quake2_p1\ntitle \"Quake2 Data (pak1)\"\ngamedir baseq2\n}\n");
+			else if (crc == 0xdc6fabf9 && !Q_strcasecmp(filename, "pak2.pak"))	ret = Z_StrDup("{\npackage quake2_p2\ntitle \"Quake2 Data (pak2)\"\ngamedir baseq2\n}\n");
+//			else if (crc == 0x && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake2_xatrixp2\ntitle \"The Reckoning\"\ngamedir baseq2\nconflict quake2_release\n}\n");
+//			else if (crc == 0x && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake2_rogue\ntitle \"Ground Zero\"\ngamedir baseq2\nconflict quake2_release\n}\n");
+//			else if (crc == 0x && !Q_strcasecmp(filename, "pak0.pak"))	ret = Z_StrDup("{\npackage quake2_release\ntitle \"Quake2 Rerelease Data\"\ngamedir baseq2\nrequire quake2ex_data\n}\n");
+//			else if (crc == 0x && !Q_strcasecmp(filename, "Q2Game.kpf"))ret = Z_StrDup("{\npackage quake2ex_data\ntitle \"Quake2 Rerelease Misc Data\"\ngamedir \"\"\n}\n");
+			//quake3
+			else if (crc == 0xb1f4d354 && !Q_strcasecmp(filename, "pak0.pk3"))	ret = Z_StrDup("{\npackage quake3_demo\ntitle \"Quake3 Demo Data\"\ngamedir baseq3\n}\n");
+			else if (crc == 0x5d626b5f && !Q_strcasecmp(filename, "pak0.pk3"))	ret = Z_StrDup("{\npackage quake3_p0\ntitle \"Quake3 Data (pak0)\"\ngamedir baseq3\n}\n");
+			else if (crc == 0x11c4fe9b && !Q_strcasecmp(filename, "pak1.pk3"))	ret = Z_StrDup("{\npackage quake3_p1\ntitle \"Quake3 Data (pak1)\"\ngamedir baseq3\n}\n");
+			else if (crc == 0x18912474 && !Q_strcasecmp(filename, "pak2.pk3"))	ret = Z_StrDup("{\npackage quake3_p2\ntitle \"Quake3 Data (pak2)\"\ngamedir baseq3\n}\n");
+			else if (crc == 0xb24e9894 && !Q_strcasecmp(filename, "pak3.pk3"))	ret = Z_StrDup("{\npackage quake3_p3\ntitle \"Quake3 Data (pak3)\"\ngamedir baseq3\n}\n");
+			else if (crc == 0x476700a6 && !Q_strcasecmp(filename, "pak4.pk3"))	ret = Z_StrDup("{\npackage quake3_p4\ntitle \"Quake3 Data (pak4)\"\ngamedir baseq3\n}\n");
+			else if (crc == 0xf39bc355 && !Q_strcasecmp(filename, "pak5.pk3"))	ret = Z_StrDup("{\npackage quake3_p5\ntitle \"Quake3 Data (pak5)\"\ngamedir baseq3\n}\n");
+			else if (crc == 0xdd13d69b && !Q_strcasecmp(filename, "pak6.pk3"))	ret = Z_StrDup("{\npackage quake3_p6\ntitle \"Quake3 Data (pak6)\"\ngamedir baseq3\n}\n");
+			else if (crc == 0x362c0725 && !Q_strcasecmp(filename, "pak7.pk3"))	ret = Z_StrDup("{\npackage quake3_p7\ntitle \"Quake3 Data (pak7)\"\ngamedir baseq3\n}\n");
+			else if (crc == 0x3a3dc1a6 && !Q_strcasecmp(filename, "pak8.pk3"))	ret = Z_StrDup("{\npackage quake3_p8\ntitle \"Quake3 Data (pak8)\"\ngamedir baseq3\n}\n");
+			else if (crc == 0x90dc1501 && !Q_strcasecmp(filename, "pak0.pk3"))	ret = Z_StrDup("{\npackage quake3_ta_p0\ntitle \"TeamArena Data (pak0)\"\ngamedir missionpack\n}\n");
+			else if (crc == 0x1e757510 && !Q_strcasecmp(filename, "pak1.pk3"))	ret = Z_StrDup("{\npackage quake3_ta_p1\ntitle \"TeamArena Data (pak1)\"\ngamedir missionpack\n}\n");
+			else if (crc == 0x9eb4a591 && !Q_strcasecmp(filename, "pak2.pk3"))	ret = Z_StrDup("{\npackage quake3_ta_p2\ntitle \"TeamArena Data (pak2)\"\ngamedir missionpack\n}\n");
+			else if (crc == 0x55c0476a && !Q_strcasecmp(filename, "pak3.pk3"))	ret = Z_StrDup("{\npackage quake3_ta_p3\ntitle \"TeamArena Data (pak3)\"\ngamedir missionpack\n}\n");
+			else
+#endif
+				ret = Z_StrDup("{\nguessed 1\n}\n");
+		}
 
 		//get the archive's qhash.
-		Q_snprintfz(qhash, hashsize, "0x%x", archive->GeneratePureCRC(archive, 0, 0));
+		Q_snprintfz(qhash, hashsize, "0x%x", crc);
 
 		line = ret;
 		do
@@ -1814,17 +1892,31 @@ void *PM_GeneratePackageFromMeta(vfsfile_t *file, char *fname, size_t fnamesize,
 	struct packagesourceinfo_s pkgsrc = {DPF_ENABLED};
 	pkgsrc.version = 3;
 	pkgsrc.categoryprefix = "";
+	Q_strncpyz(pkgsrc.gamedir, FS_GetGamedir(true), sizeof(pkgsrc.gamedir));
 
 	COM_StripAllExtensions(COM_SkipPath(fname), pkgname,sizeof(pkgname));
 
 	PM_PreparePackageList();	//just in case.
 
 	//see if we can make any sense of it.
-	PM_ParsePackage(&pkgsrc, pkgdata, &p, 1);
+	PM_ParsePackage(&pkgsrc, pkgdata, &p, 1, fname);
 	if (p)
 	{
-		if (p->extract == EXTRACT_COPY)
+		/*if (!(p->fsroot == FS_ROOT && *p->gamedir) && FS_RELATIVE_ISSPECIAL(p->fsroot))
+		{	//the metadata is useless if it says to put it somewhere unsafe, though signed packages mean this is at least mostly safe...
+			Z_Free(pkgdata);
+			pkgdata = NULL;
+			Menu_PromptOrPrint(va(localtext("Refusing to install to requested location\n%s\n"), fname), "Cancel", true);
+		}
+		else*/ if (!PM_SignatureOkay(p))
+		{	//only allow if its trustworthy (or paks/pk3s)
+			Z_Free(pkgdata);
+			pkgdata = NULL;
+			Menu_PromptOrPrint(va(localtext("Bad MetaData Signature\n%s\n"), fname), "Cancel", true);
+		}
+		else if (p->extract == EXTRACT_COPY)
 		{
+			vfsfile_t *vfs;
 			const char *f = PM_GetDepSingle(p, DEP_FILE);
 			if (!f)
 				f = va("%s", fname);	//erk?
@@ -1833,12 +1925,27 @@ void *PM_GeneratePackageFromMeta(vfsfile_t *file, char *fname, size_t fnamesize,
 				f = va("%s/%s", p->gamedir, f);
 
 			Z_StrDupPtr(&p->qhash, qhash);
-			if (PM_TryGenCachedName(f, p, fname, fnamesize))
+
+			vfs = FS_OpenVFS(f, "rb", p->fsroot);	//if they're dropping pak0.pak, don't overwrite anything.
+			if (vfs)
+			{
+				VFS_CLOSE(vfs);
+				Z_Free(pkgdata);
+				pkgdata = NULL;
+				Menu_PromptOrPrint(va(localtext("File is already installed\n%s\n"), fname), "Cancel", true);
+			}
+			if (!vfs && PM_TryGenCachedName(f, p, fname, fnamesize))
 				;
 			else
 				Q_strncpyz(fname, f, fnamesize);
 			*fsroot = p->fsroot;
 		}
+		else
+		{	//we're doing drag+drop single-file logic here, so don't want to handle extracting everything with the risk of overwriting.
+			Z_Free(pkgdata);
+			pkgdata = NULL;
+			Menu_PromptOrPrint(va(localtext("Package installation too complex\n%s\n"), fname), "Cancel", true);
+		}
 
 		//okay, seems there's something in it.
 		PM_FreePackage(p);
@@ -1861,7 +1968,7 @@ static qboolean PM_FileInstalled_Internal(const char *package, const char *categ
 		pkgsrc.version = 3;
 		pkgsrc.categoryprefix = "";
 
-		PM_ParsePackage(&pkgsrc, metainfo, &p, 1);
+		PM_ParsePackage(&pkgsrc, metainfo, &p, 1, package);
 		if (!p)
 			return false;
 	}
@@ -1872,9 +1979,16 @@ static qboolean PM_FileInstalled_Internal(const char *package, const char *categ
 		strcpy(p->version, "?" "?" "?" "?");
 	}
 
-	p->deps = Z_Malloc(sizeof(*p->deps) + strlen(filename));
-	p->deps->dtype = DEP_FILE;
-	strcpy(p->deps->name, filename);
+	if (PM_HasDep(p, DEP_FILE, filename))
+		;	//no dupes
+	else if (PM_GetDepSingle(p, DEP_FILE))
+	{	//a filename was specified, but it differs from what we expected...
+		Con_Printf(CON_WARNING"PM_FileInstalled: filename does not match metadata info\n");
+		PM_FreePackage(p);
+		return false;
+	}
+	else
+		PM_AddDep(p, DEP_FILE, filename);
 
 	dlcache = strstr(p->deps->name+1, "/dlcache/");
 	if (dlcache)
@@ -1932,8 +2046,12 @@ static qboolean PM_FileInstalled_Internal(const char *package, const char *categ
 	if (enable)
 		p->flags |= DPF_USERMARKED|DPF_ENABLED;
 
-	if (PM_InsertPackage(p))
+	p = PM_InsertPackage(p);
+	if (p)
 	{
+		if (enable && !(p->flags&DPF_ENABLED))
+			Con_Printf(CON_WARNING"PM_FileInstalled: package failed to enable\n");
+//			Cmd_ExecuteString("menu_download\n", RESTRICT_LOCAL);
 		PM_ResortPackages();
 		PM_WriteInstalledPackages();
 	}
@@ -1944,7 +2062,7 @@ void PM_FileInstalled(const char *filename, enum fs_relative fsroot, void *metai
 {
 	char pkgname[MAX_QPATH];
 	COM_StripAllExtensions(COM_SkipPath(filename), pkgname,sizeof(pkgname));
-	PM_FileInstalled_Internal(pkgname, "", pkgname, filename, fsroot, DPF_GUESSED,  metainfo, enable);
+	PM_FileInstalled_Internal(pkgname, "", pkgname, filename, fsroot, /*metainfo?0:*/DPF_GUESSED,  metainfo, enable);
 }
 
 #ifdef PLUGINS
@@ -2102,21 +2220,29 @@ static void PM_PreparePackageList(void)
 				fl |= SRCFL_DISABLED;	//don't trust it, don't even prompt.
 
 			while ((s = COM_Parse(s)))
-				PM_AddSubList(com_token, NULL, fl);	//enable it by default. functionality is kinda broken otherwise.
+			{
+#ifdef FTE_TARGET_WEB
+				if (*com_token == '/' && !(fl&SRCFL_DISABLED))
+					PM_AddSubList(com_token, NULL, fl|SRCFL_ENABLED);	//enable it by default, its too annoying otherwise.
+				else
+#endif
+					PM_AddSubList(com_token, NULL, fl);
+			}
 		}
 
 #ifdef PLUGINS
 		{
-			char nat[MAX_OSPATH];
-			if (FS_NativePath("", FS_BINARYPATH, nat, sizeof(nat)))
+			char sys[MAX_OSPATH];
+			char disp[MAX_OSPATH];
+			if (FS_DisplayPath("", FS_BINARYPATH, disp, sizeof(disp))&&FS_SystemPath("", FS_BINARYPATH, sys, sizeof(sys)))
 			{
-				Con_DPrintf("Loading plugins from \"%s\"\n", nat);
-				Sys_EnumerateFiles(nat, PLUGINPREFIX"*" ARCH_DL_POSTFIX, PM_EnumeratedPlugin, (void*)FS_BINARYPATH, NULL);
+				Con_DPrintf("Loading plugins from \"%s\"\n", disp);
+				Sys_EnumerateFiles(sys, PLUGINPREFIX"*" ARCH_DL_POSTFIX, PM_EnumeratedPlugin, (void*)FS_BINARYPATH, NULL);
 			}
-			if (FS_NativePath("", FS_LIBRARYPATH, nat, sizeof(nat)))
+			if (FS_DisplayPath("", FS_LIBRARYPATH, disp, sizeof(disp))&&FS_SystemPath("", FS_LIBRARYPATH, sys, sizeof(sys)))
 			{
-				Con_DPrintf("Loading plugins from \"%s\"\n", nat);
-				Sys_EnumerateFiles(nat, PLUGINPREFIX"*" ARCH_DL_POSTFIX, PM_EnumeratedPlugin, (void*)FS_LIBRARYPATH, NULL);
+				Con_DPrintf("Loading plugins from \"%s\"\n", disp);
+				Sys_EnumerateFiles(sys, PLUGINPREFIX"*" ARCH_DL_POSTFIX, PM_EnumeratedPlugin, (void*)FS_LIBRARYPATH, NULL);
 			}
 		}
 #endif
@@ -2134,6 +2260,51 @@ void PM_ManifestChanged(ftemanifest_t *man)
 	PM_UpdatePackageList(false);
 }
 
+qboolean PM_HandleRedirect(const char *package, /*char *cachename, size_t cachesize,*/ char *url, size_t urlsize)
+{	//given a "GAMEDIR/PACKAGEFILE", swap it out for a real path/url that a client can download.
+	//eg "package/GAMEDIR/dlcache/PACKAGEFILE.xxxxxxxx" or http://whereeverweoriginallydownloadeditfrom"
+	char gamedir[16];
+	char *sep;
+	package_t *p;
+char *cachename = NULL; size_t cachesize=0;
+	sep = strchr(package, '/');
+	*cachename = 0;
+	if (!sep)
+		return false;	//no gamedir? that doesn't seem right. tell em to fuck off.
+	if (sep-package >= sizeof(gamedir))
+		return false;	//overflow
+	memcpy(gamedir, package, sep-package);
+	gamedir[sep-package] = 0;
+	sep++;
+	for (p = availablepackages; p; p = p->next)
+	{
+		if (!(p->flags & DPF_PRESENT))
+			continue;	//dunno, shouldn't really be trying to download it if its not even on the server.
+		if (strcmp(p->gamedir, gamedir))
+			continue;	//nope, some other gamedir perhaps.
+		if (PM_HasDep(p, DEP_FILE, sep))
+		{
+			if (!(p->flags & DPF_CACHED) || !PM_TryGenCachedName(package, p, cachename, cachesize))
+				*cachename = 0;
+			if (p->mirror[0])
+			{
+				Q_strncpyz(url, p->mirror[0], urlsize);
+				return true;
+			}
+			if (p->flags & DPF_CACHED)
+			{
+				Q_snprintfz(url, urlsize, "package/%s", cachename);
+				return true;
+			}
+			return false;	//native? don't redirect it locally.
+		}
+		/*if (PM_HasDep(p, DEP_CACHEFILE, sep))
+		{
+			Q_snprintfz(cachename, sizeof(cachename), "downloads/%s", d->name);
+		}*/
+	}
+	return false;
+}
 void PM_LoadPackages(searchpath_t **oldpaths, const char *parent_pure, const char *parent_logical, searchpath_t *search, unsigned int loadstuff, int minpri, int maxpri)
 {
 	package_t *p;
@@ -2157,7 +2328,11 @@ void PM_LoadPackages(searchpath_t **oldpaths, const char *parent_pure, const cha
 			if ((p->flags & (DPF_ENABLED|DPF_MANIMARKED)) && p->priority==pri && !Q_strcasecmp(parent_pure, p->gamedir))
 			{
 				char *qhash = (p->qhash&&*p->qhash)?p->qhash:NULL;
-				unsigned int fsfl = SPF_COPYPROTECTED;
+				unsigned int fsfl = 0;
+				if (p->flags & DPF_CACHED)
+					fsfl |= 0;	//package is in the dlcache dir... if its downloaded from somewhere then its probably a bit rich to block it from downloading from elsewhere.
+				else
+					fsfl |= SPF_COPYPROTECTED;
 				if (qhash && (p->flags&DPF_TRUSTED))
 					;
 				else
@@ -2239,7 +2414,7 @@ static package_t *PM_FindExactPackage(const char *packagename, const char *arch,
 		{
 			if (arch && (!p->arch||strcmp(p->arch, arch)))
 				continue;	//wrong arch.
-			if (!arch && p->arch && *p->arch && strcmp(p->arch, THISARCH))
+			if (!arch && p->arch && *p->arch && Q_strcasecmp(p->arch, THISARCH))
 				continue;	//wrong arch.
 			if (flags && !(p->flags & flags))
 				continue;
@@ -2400,6 +2575,21 @@ static void PM_UnmarkPackage(package_t *package, unsigned int markflag)
 	}
 }
 
+static package_t *PM_RootForAlt(package_t *package)
+{
+	package_t *p, *a;
+	for (p = availablepackages; p; p = p->next)
+	{
+		if (p == package)
+			return p;
+		for (a = p->alternative; a; a = a->next)
+		{
+			if (a == package)
+				return p;
+		}
+	}
+	return NULL;	//some kind of error
+}
 //just flags, doesn't install
 //returns true if it was marked (or already enabled etc), false if we're not allowed.
 static qboolean PM_MarkPackage(package_t *package, unsigned int markflag)
@@ -2407,9 +2597,13 @@ static qboolean PM_MarkPackage(package_t *package, unsigned int markflag)
 	package_t *o;
 	struct packagedep_s *dep, *dep2;
 	qboolean replacing = false;
+	package_t *root;	//if its an alt package, we want to do some switcheroos
 
 	if (pkg_updating)
+	{
+		Con_Printf("PM_MarkPackage: busy...\n");
 		return false;
+	}
 
 	if (package->flags & DPF_MARKED)
 	{
@@ -2422,11 +2616,15 @@ static qboolean PM_MarkPackage(package_t *package, unsigned int markflag)
 	if (!(package->flags & DPF_PRESENT))
 	{	//though we can at least unmark it for deletion...
 		package->flags &= ~DPF_PURGE;
+		Con_Printf("PM_MarkPackage: unable to download, and not already present.\n");
 		return false;
 	}
 #else
 	if (!PM_SignatureOkay(package))
+	{
+		Con_Printf(CON_WARNING"%s: package not trusted, refusing to mark.\n", package->name);
 		return false;
+	}
 #endif
 
 	//any file-conflicts prevent the package from being installable.
@@ -2441,10 +2639,41 @@ static qboolean PM_MarkPackage(package_t *package, unsigned int markflag)
 			else
 				n = dep->name;
 			if (PM_CheckFile(n, package->fsroot))
+			{
+				char tmp[MAX_OSPATH];
+				FS_DisplayPath(n, package->fsroot, tmp,sizeof(tmp));
+				Con_Printf(CON_WARNING"%s: conflicts with existing file \"%s\"\n", package->name, tmp);
 				return false;
+			}
 		}
 	}
 
+	root = PM_RootForAlt(package);
+	if (root != package && (package->flags&DPF_TRUSTED) >= (root->flags&DPF_TRUSTED))
+	{
+		//unlink the new.
+		*package->link = package->next;
+		if (package->next)
+			package->next->link = package->link;
+
+		//replace the old root with the new
+		*root->link = package;
+		package->next = root->next;
+		if (package->next)
+			package->next->link = &package->next;
+
+		//insert the old into the new's alt
+		root->next = package->alternative;
+		if (root->next)
+			root->next->link = &root->next;
+		root->link = &package->alternative;
+		*root->link = root;
+
+		root->flags &= ~DPF_ALLMARKED;
+	}
+	else if (root != package)
+		return false;
+
 	package->flags |= markflag;
 
 	//first check to see if we're replacing a different version of the same package
@@ -2506,6 +2735,8 @@ static qboolean PM_MarkPackage(package_t *package, unsigned int markflag)
 					else
 						PM_MarkPackage(d, DPF_AUTOMARKED);
 				}
+				else if (dep->dtype == DEP_REQUIRE)
+					Con_Printf(CON_WARNING"Couldn't find dependancy \"%s\"\n", dep->name);
 				else
 					Con_DPrintf("Couldn't find dependancy \"%s\"\n", dep->name);
 			}
@@ -2555,8 +2786,8 @@ unsigned int PM_MarkUpdates (void)
 		char *strings = fs_manifest->installupd;
 		while (strings && *strings)
 		{
-			qboolean isunwanted = (*tok=='!');
-			strings = COM_ParseStringSetSep(strings, ';', tok+isunwanted, sizeof(tok));
+			qboolean isunwanted = (*strings=='!');
+			strings = COM_ParseStringSetSep(strings+isunwanted, ';', tok, sizeof(tok));
 
 			p = PM_MarkedPackage(tok, DPF_MARKED);
 			if (!p)
@@ -3279,11 +3510,11 @@ static void PM_WriteInstalledPackages(void)
 	int i;
 	char *s;
 	package_t *p;
-	vfsfile_t *f = FS_OpenVFS(INSTALLEDFILES, "wb", FS_ROOT);
+	vfsfile_t *f = FS_OpenVFS(INSTALLEDFILES, "wbp", FS_ROOT);
 	qboolean v3 = false;
 	if (!f)
 	{
-		if (FS_NativePath(INSTALLEDFILES, FS_ROOT, buf, sizeof(buf)))
+		if (FS_DisplayPath(INSTALLEDFILES, FS_ROOT, buf, sizeof(buf)))
 			Con_Printf("package manager: Can't write %s\n", buf);
 		else
 			Con_Printf("package manager: Can't update installed list\n");
@@ -3394,7 +3625,7 @@ static void PM_PackageEnabled(package_t *p)
 #define Menu_Prompt(cb,ctx,msg,yes,no,cancel,highpri) Con_Printf(CON_WARNING "%s\n", msg)
 #endif
 
-		if (FS_NativePath(ef->name, p->fsroot, native, sizeof(native)) && Sys_SetUpdatedBinary(native))
+		if (FS_SystemPath(ef->name, p->fsroot, native, sizeof(native)) && Sys_SetUpdatedBinary(native))
 		{
 			Q_strncpyz(enginerevision, p->version, sizeof(enginerevision));	//make sure 'revert' picks up the new binary...
 			Menu_Prompt(NULL, NULL, localtext("Engine binary updated.\nRestart to use."), NULL, NULL, NULL, true);
@@ -3440,7 +3671,7 @@ static int QDECL PM_ExtractFiles(const char *fname, qofs_t fsize, time_t mtime,
 static qboolean PM_Download_Got_Extract(package_t *p, searchpathfuncs_t *archive, const char *tempname, enum fs_relative temproot)
 {	//EXTRACT_EXPLICITZIP is very special.
 	qboolean success = false;
-	char native[MAX_OSPATH];
+	char displayname[MAX_OSPATH];
 	char ext[8];
 	char *destname;
 	struct packagedep_s *dep, *srcname = p->deps;
@@ -3490,7 +3721,11 @@ static qboolean PM_Download_Got_Extract(package_t *p, searchpathfuncs_t *archive
 		{
 			while (srcname && srcname->dtype != DEP_EXTRACTNAME)
 				srcname = srcname->next;
-			if (archive)
+			if (!archive)
+				Con_Printf(CON_ERROR"archive %s is not an archive!\n", tempname);
+			else if (!srcname)
+				Con_Printf(CON_ERROR"archive %s is EXTRACT_EXPLICITZIP but filename not specified!\n", tempname);
+			else
 			{
 				flocation_t loc;
 
@@ -3502,38 +3737,46 @@ static qboolean PM_Download_Got_Extract(package_t *p, searchpathfuncs_t *archive
 						archive->ReadFile(archive, &loc, f);
 						if (FS_WriteFile(destname, f, loc.len, p->fsroot))
 						{
-							if (!FS_NativePath(destname, p->fsroot, native, sizeof(native)))
-								Q_strncpyz(native, destname, sizeof(native));
-							Con_Printf("Extracted %s (to %s)\n", p->name, native);
+							if (!FS_DisplayPath(destname, p->fsroot, displayname, sizeof(displayname)))
+								Q_strncpyz(displayname, destname, sizeof(displayname));
+							Con_Printf(CON_WARNING"Extracted %s (to %s)\n", p->name, displayname);
 
 							p->flags = nfl;
 							success = true;
 							continue;
 						}
+						else
+						{
+							if (!FS_DisplayPath(destname, p->fsroot, displayname, sizeof(displayname)))
+								Q_strncpyz(displayname, destname, sizeof(displayname));
+							Con_Printf(CON_ERROR"Failed to write %s (extracting %s)\n", displayname, p->name);
+						}
 					}
 				}
+				else
+					Con_Printf(CON_ERROR"Failed to find %s in archive %s\n", srcname->name, tempname);
 			}
 
-			if (!FS_NativePath(destname, p->fsroot, native, sizeof(native)))
-				Q_strncpyz(native, destname, sizeof(native));
-			Con_Printf("Couldn't extract %s/%s to %s. Removed instead.\n", tempname, dep->name, native);
+			if (!FS_DisplayPath(destname, p->fsroot, displayname, sizeof(displayname)))
+				Q_strncpyz(displayname, destname, sizeof(displayname));
+			Con_Printf(CON_ERROR"Couldn't extract %s/%s to %s. Removed instead.\n", tempname, dep->name, displayname);
 
 			success = false;
 		}
 		else if (!FS_Rename2(tempname, destname, temproot, p->fsroot))
 		{
 			//error!
-			if (!FS_NativePath(destname, p->fsroot, native, sizeof(native)))
-				Q_strncpyz(native, destname, sizeof(native));
-			Con_Printf("Couldn't rename %s to %s. Removed instead.\n", tempname, native);
+			if (!FS_DisplayPath(destname, p->fsroot, displayname, sizeof(displayname)))
+				Q_strncpyz(displayname, destname, sizeof(displayname));
+			Con_Printf(CON_ERROR"Couldn't rename %s to %s. Removed instead.\n", tempname, displayname);
 
 			success = false;
 		}
 		else
 		{	//success!
-			if (!FS_NativePath(destname, p->fsroot, native, sizeof(native)))
-				Q_strncpyz(native, destname, sizeof(native));
-			Con_Printf("Downloaded %s (to %s)\n", p->name, native);
+			if (!FS_DisplayPath(destname, p->fsroot, displayname, sizeof(displayname)))
+				Q_strncpyz(displayname, destname, sizeof(displayname));
+			Con_Printf("Downloaded %s (to %s)\n", p->name, displayname);
 
 			p->flags = nfl;
 
@@ -3930,7 +4173,7 @@ static qboolean PM_SignatureOkay(package_t *p)
 
 		//only allow .pak/.pk3/.zip without a signature, and only when they have a qhash specified (or the .fmf specified it without a qhash...).
 		ext = COM_GetFileExtension(dep->name, NULL);
-		if ((!stricmp(ext, ".pak") || !stricmp(ext, ".pk3") || !stricmp(ext, ".zip")) && (p->qhash || dep->dtype == DEP_CACHEFILE || (p->flags&DPF_MANIFEST)))
+		if ((!stricmp(ext, ".kpf") || !stricmp(ext, ".pak") || !stricmp(ext, ".pk3") || !stricmp(ext, ".zip")) && (p->qhash || dep->dtype == DEP_CACHEFILE || (p->flags&DPF_MANIFEST)))
 			;
 		else
 			return false;
@@ -4076,14 +4319,18 @@ static void PM_StartADownload(void)
 				if (i == countof(p->mirror))
 				{	//this appears to be a meta package with no download
 					//just directly install it.
-					//FIXME: make sure there's no files...
-					p->flags &= ~(DPF_NATIVE|DPF_CACHED|DPF_CORRUPT);
-					if (p->flags & DPF_MARKED)
-						p->flags |= DPF_ENABLED;
+					if (PM_HasDep(p, DEP_FILE, NULL))
+						Con_Printf("Unable to install package %s due to lack of any mirrors\n", p->name);
+					else
+					{
+						p->flags &= ~(DPF_NATIVE|DPF_CACHED|DPF_CORRUPT);
+						if (p->flags & DPF_MARKED)
+							p->flags |= DPF_ENABLED;
 
-					Con_Printf("Enabled meta package %s\n", p->name);
-					PM_WriteInstalledPackages();
-					PM_PackageEnabled(p);
+						Con_Printf("Enabled meta package %s\n", p->name);
+						PM_WriteInstalledPackages();
+						PM_PackageEnabled(p);
+					}
 				}
 				continue;
 			}
@@ -4168,8 +4415,8 @@ static void PM_StartADownload(void)
 			}
 			else
 			{
-				char syspath[MAX_OSPATH];
-				Con_Printf("Unable to write %s. Fix permissions before trying to download %s\n", FS_NativePath(temp, temproot, syspath, sizeof(syspath))?syspath:p->name, p->name);
+				char displaypath[MAX_OSPATH];
+				Con_Printf("Unable to write %s. Fix permissions before trying to download %s\n", FS_DisplayPath(temp, temproot, displaypath, sizeof(displaypath))?displaypath:p->name, p->name);
 				p->trymirrors = 0;	//don't bother trying other mirrors if we can't write the file or understand its type.
 			}
 			if (p->download)
@@ -4598,6 +4845,175 @@ qboolean PM_CanInstall(const char *packagename)
 	return false;
 }
 
+static void PM_Pkg_ListSources(qboolean onlyenabled)
+{
+	size_t i, c=0, e=0;
+	for (i = 0; i < pm_numsources; i++)
+	{
+		if ((pm_source[i].flags & SRCFL_HISTORIC) && !developer.ival)
+			continue;	//hidden ones were historically enabled/disabled. remember the state even when using a different fmf, but don't confuse the user.
+
+		c++;
+		if (pm_source[i].flags & SRCFL_ENABLED)
+			e++;
+		else if (onlyenabled)
+			continue;
+
+		if (pm_source[i].flags & SRCFL_ENABLED)
+			Con_Printf("^&02 ");
+		else if (pm_source[i].flags & SRCFL_DISABLED)
+			Con_Printf("^&04 ");
+		else
+			Con_Printf("^&0E ");
+
+		if (pm_source[i].flags & SRCFL_DISABLED)
+			Con_Printf("%s ", pm_source[i].url);	//enable
+		else
+			Con_Printf("%s ", pm_source[i].url);	//disable
+
+		if (pm_source[i].flags & SRCFL_USER)
+			Con_Printf("- ^[[Delete]\\type\\pkg remsource \"%s\"^]\n", pm_source[i].url);
+		else
+			Con_Printf("(implicit)\n");
+	}
+	if (c != e)
+		Con_Printf("<%u sources, %u enabled>\n", (unsigned)c, (unsigned)e);
+	else
+		Con_Printf("<%u sources>\n", (unsigned)c);
+}
+static void PM_Pkg_ListPackage(package_t *p, const char **category)
+{
+	const char *newcat;
+	char quoted[8192];
+	const char *status;
+	char *markup;
+	struct packagedep_s *dep;
+
+	if (p->flags & DPF_ENABLED)
+		markup = S_COLOR_GREEN;
+	else if (p->flags & DPF_CORRUPT)
+		markup = S_COLOR_RED;
+	else if (p->flags & (DPF_CACHED))
+		markup = S_COLOR_YELLOW;	//downloaded but not active
+	else
+		markup = S_COLOR_WHITE;
+
+	if (!(p->flags & DPF_MARKED) != !(p->flags & DPF_ENABLED) || (p->flags & DPF_PURGE))
+	{
+		if (p->flags & DPF_MARKED)
+		{
+			if (p->flags & DPF_PURGE)
+				status = S_COLOR_CYAN"<to reinstall>";
+			else
+				status = S_COLOR_CYAN"<to install>";
+		}
+		else if ((p->flags & DPF_PURGE) || !(p->qhash && (p->flags & DPF_CACHED)))
+			status = S_COLOR_CYAN"<to uninstall>";
+		else
+			status = S_COLOR_CYAN"<to disable>";
+	}
+	else if ((p->flags & (DPF_ENABLED|DPF_CACHED)) == DPF_CACHED)
+		status = S_COLOR_CYAN"<disabled>";
+	else if (p->flags & DPF_USERMARKED)
+		status = S_COLOR_GRAY"<manual>";
+	else if (p->flags & DPF_AUTOMARKED)
+		status = S_COLOR_GRAY"<auto>";
+	else
+		status = "";
+
+	//show category banner
+	newcat = p->category?p->category:"";
+	if (strcmp(*category, newcat))
+	{
+		*category = newcat;
+		Con_Printf("%s\n", *category);
+	}
+
+	//show quick status display
+	if (p->flags & DPF_ENABLED)
+		Con_Printf("^&02 ");
+	else if (p->flags & DPF_PRESENT)
+		Con_Printf("^&0E ");
+	else
+		Con_Printf("^&04 ");
+	if (p->flags & DPF_MARKED)
+		Con_Printf("^&02 ");
+	else if (!(p->flags & DPF_PURGE) && (p->flags&DPF_PRESENT))
+		Con_Printf("^&0E ");
+	else
+		Con_Printf("^&04 ");
+
+	//show the package details.
+	Con_Printf("\t^["S_COLOR_GRAY"%s%s%s%s^] %s"S_COLOR_GRAY" %s (%s%s)", markup, p->name, p->arch?":":"", p->arch?p->arch:"", status, strcmp(p->name, p->title)?p->title:"", p->version, (p->flags&DPF_TESTING)?"-testing":"");
+
+	for (dep = p->deps; dep; dep = dep->next)
+	{
+		if (dep->dtype == DEP_SOURCE)
+			Con_Printf(S_COLOR_MAGENTA" %s", dep->name);
+	}
+
+	if (!(p->flags&DPF_MARKED) && p == PM_FindPackage(p->name))
+		Con_Printf(" ^[[Add]\\type\\pkg add %s;pkg apply^]", COM_QuotedString(p->name, quoted, sizeof(quoted), false));
+	if ((p->flags&DPF_MARKED) && p == PM_MarkedPackage(p->name, DPF_MARKED))
+		Con_Printf(" ^[[Remove]\\type\\pkg rem %s;pkg apply^]", COM_QuotedString(p->name, quoted, sizeof(quoted), false));
+
+
+	if (p->flags & DPF_SIGNATUREACCEPTED)
+		Con_Printf(" ^&02Trusted");
+	else if (p->flags & DPF_SIGNATUREREJECTED)
+		Con_Printf(" ^&04Untrusted");
+	else if (p->flags & DPF_SIGNATUREUNKNOWN)
+		Con_Printf(" ^&0EUnverified");
+	else
+		Con_Printf(" ^&0EUnsigned");
+
+	if (p->download)
+	{
+		if (p->download->totalsize==0)
+			Con_Printf(" Downloading %s/unknown", FS_AbbreviateSize(quoted,sizeof(quoted), p->download->completed));
+		else
+			Con_Printf(" Downloading %i%% (%s total)", (int)(100*(double)p->download->completed/(double)p->download->totalsize), FS_AbbreviateSize(quoted,sizeof(quoted), p->download->totalsize));
+	}
+	else if (p->trymirrors)
+		Con_Printf(" Pending...");
+
+	Con_Printf("\n");
+}
+static void PM_Pkg_ListPackages(qboolean onlyenabled)
+{
+	const char *category = "";
+	int i, count;
+	package_t **sorted, *p, *a;
+
+	for (count = 0, p = availablepackages; p; p=p->next)
+		count++;
+	sorted = Z_Malloc(sizeof(*sorted)*count);
+	for (count = 0, p = availablepackages; p; p=p->next)
+	{
+		if ((p->flags & DPF_HIDDEN) && !(p->flags & (DPF_MARKED|DPF_ENABLED|DPF_PURGE|DPF_CACHED)))
+			continue;
+
+		if (p->flags & DPF_ALLMARKED)
+			;
+		else if (onlyenabled)
+			continue;
+
+		sorted[count++] = p;
+	}
+	qsort(sorted, count, sizeof(*sorted), PM_PackageSortOrdering);
+	for (i = 0; i < count; i++)
+	{
+		PM_Pkg_ListPackage(sorted[i], &category);
+		for(a=sorted[i]->alternative; a; a = a->next)
+		{
+			Con_Printf(" ");
+			PM_Pkg_ListPackage(a, &category);
+		}
+	}
+	Z_Free(sorted);
+	Con_Printf("<end of list>\n");
+}
+
 void PM_Command_f(void)
 {
 	package_t *p;
@@ -4617,37 +5033,13 @@ void PM_Command_f(void)
 		act += 6;
 	}
 
-	if (!strcmp(act, "sources") || !strcmp(act, "addsource"))
+	if (!strcmp(act, "listenabledsources"))
+		PM_Pkg_ListSources(true);
+	else if (!strcmp(act, "sources") || !strcmp(act, "addsource"))
 	{
 		#ifdef WEBCLIENT
 			if (Cmd_Argc() == 2)
-			{
-				size_t i, c=0;
-				for (i = 0; i < pm_numsources; i++)
-				{
-					if ((pm_source[i].flags & SRCFL_HISTORIC) && !developer.ival)
-						continue;	//hidden ones were historically enabled/disabled. remember the state even when using a different fmf, but don't confuse the user.
-
-					if (pm_source[i].flags & SRCFL_ENABLED)
-						Con_Printf("^&02 ");
-					else if (pm_source[i].flags & SRCFL_DISABLED)
-						Con_Printf("^&04 ");
-					else
-						Con_Printf("^&0E ");
-
-					if (pm_source[i].flags & SRCFL_DISABLED)
-						Con_Printf("%s ", pm_source[i].url);	//enable
-					else
-						Con_Printf("%s ", pm_source[i].url);	//disable
-
-					if (pm_source[i].flags & SRCFL_USER)
-						Con_Printf("- ^[[Delete]\\type\\pkg remsource \"%s\"^]\n", pm_source[i].url);
-					else
-						Con_Printf("(implicit)\n");
-					c++;
-				}
-				Con_Printf("<%u sources>\n", (unsigned)c);
-			}
+				PM_Pkg_ListSources(false);
 			else
 			{
 				#ifdef HAVE_CLIENT
@@ -4661,123 +5053,23 @@ void PM_Command_f(void)
 	}
 	else if (!strcmp(act, "remsource"))
 	{
-		#ifdef WEBCLIENT
-			PM_RemSubList(Cmd_Argv(2));
-			PM_WriteInstalledPackages();
-		#endif
+	#ifdef WEBCLIENT
+		PM_RemSubList(Cmd_Argv(2));
+		PM_WriteInstalledPackages();
+	#endif
 	}
 	else
 	{
-	
 		if (!loadedinstalled)
 			PM_UpdatePackageList(false);
 
 		if (!strcmp(act, "list"))
 		{
-			int i, count;
-			package_t **sorted;
-			const char *category = "", *newcat;
-			struct packagedep_s *dep;
-			for (count = 0, p = availablepackages; p; p=p->next)
-				count++;
-			sorted = Z_Malloc(sizeof(*sorted)*count);
-			for (count = 0, p = availablepackages; p; p=p->next)
-			{
-				if ((p->flags & DPF_HIDDEN) && !(p->flags & (DPF_MARKED|DPF_ENABLED|DPF_PURGE|DPF_CACHED)))
-					continue;
-				sorted[count++] = p;
-			}
-			qsort(sorted, count, sizeof(*sorted), PM_PackageSortOrdering);
-			for (i = 0; i < count; i++)
-			{
-				char quoted[8192];
-				const char *status;
-				char *markup;
-				p = sorted[i];
-
-				if (p->flags & DPF_ENABLED)
-					markup = S_COLOR_GREEN;
-				else if (p->flags & DPF_CORRUPT)
-					markup = S_COLOR_RED;
-				else if (p->flags & (DPF_CACHED))
-					markup = S_COLOR_YELLOW;	//downloaded but not active
-				else
-					markup = S_COLOR_WHITE;
-
-				if (!(p->flags & DPF_MARKED) != !(p->flags & DPF_ENABLED) || (p->flags & DPF_PURGE))
-				{
-					if (p->flags & DPF_MARKED)
-					{
-						if (p->flags & DPF_PURGE)
-							status = S_COLOR_CYAN"<reinstall>";
-						else
-							status = S_COLOR_CYAN"<inst	all>";
-					}
-					else if ((p->flags & DPF_PURGE) || !(p->qhash && (p->flags & DPF_CACHED)))
-						status = S_COLOR_CYAN"<uninstall>";
-					else
-						status = S_COLOR_CYAN"<disable>";
-				}
-				else if ((p->flags & (DPF_ENABLED|DPF_CACHED)) == DPF_CACHED)
-					status = S_COLOR_CYAN"<disabled>";
-				else if (p->flags & DPF_USERMARKED)
-					status = S_COLOR_GRAY"<manual>";
-				else if (p->flags & DPF_AUTOMARKED)
-					status = S_COLOR_GRAY"<auto>";
-				else
-					status = "";
-
-				//show category banner
-				newcat = p->category?p->category:"";
-				if (strcmp(category, newcat))
-				{
-					category = newcat;
-					Con_Printf("%s\n", category);
-				}
-
-				//show quick status display
-				if (p->flags & DPF_ENABLED)
-					Con_Printf("^&02 ");
-				else if (p->flags & DPF_PRESENT)
-					Con_Printf("^&0E ");
-				else
-					Con_Printf("^&04 ");
-				if (p->flags & DPF_MARKED)
-					Con_Printf("^&02 ");
-				else if (!(p->flags & DPF_PURGE) && (p->flags&DPF_PRESENT))
-					Con_Printf("^&0E ");
-				else
-					Con_Printf("^&04 ");
-
-				//show the package details.
-				Con_Printf("\t^["S_COLOR_GRAY"%s%s%s%s^] %s"S_COLOR_GRAY" %s (%s%s)", markup, p->name, p->arch?":":"", p->arch?p->arch:"", status, strcmp(p->name, p->title)?p->title:"", p->version, (p->flags&DPF_TESTING)?"-testing":"");
-
-				for (dep = p->deps; dep; dep = dep->next)
-				{
-					if (dep->dtype == DEP_SOURCE)
-						Con_Printf(S_COLOR_MAGENTA" %s", dep->name);
-				}
-
-				if (!(p->flags&DPF_MARKED) && p == PM_FindPackage(p->name))
-					Con_Printf(" ^[[Add]\\type\\pkg add %s;pkg apply^]", COM_QuotedString(p->name, quoted, sizeof(quoted), false));
-				if ((p->flags&DPF_MARKED) && p == PM_MarkedPackage(p->name, DPF_MARKED))
-					Con_Printf(" ^[[Remove]\\type\\pkg rem %s;pkg apply^]", COM_QuotedString(p->name, quoted, sizeof(quoted), false));
-
-
-				if (p->flags & DPF_SIGNATUREACCEPTED)
-					Con_Printf(" ^&02Trusted");
-				else if (p->flags & DPF_SIGNATUREREJECTED)
-					Con_Printf(" ^&04Untrusted");
-				else if (p->flags & DPF_SIGNATUREUNKNOWN)
-					Con_Printf(" ^&0EUnverified");
-				else
-					Con_Printf(" ^&0EUnsigned");
-
-				Con_Printf("\n");
-			}
-			Z_Free(sorted);
-			Con_Printf("<end of list>\n");
+			PM_Pkg_ListSources(false);
+			PM_Pkg_ListPackages(false);
 		}
+		else if (!strcmp(act, "listmarked"))
+			PM_Pkg_ListPackages(true);
 		else if (!strcmp(act, "internal"))
 		{
 			char buf[65536];
@@ -4865,6 +5157,8 @@ void PM_Command_f(void)
 					Con_Printf("	package is an engine update\n");
 				if (p->flags & DPF_TESTING)
 					Con_Printf(S_COLOR_YELLOW"	package is untested\n");
+				if (p->flags & DPF_TRUSTED)
+					Con_Printf("	package is trusted\n");
 #ifdef WEBCLIENT
 				if (!PM_SignatureOkay(p))
 				{
@@ -4925,7 +5219,12 @@ void PM_Command_f(void)
 			for (i = 0; i < pm_numsources; i++)
 			{
 				if (!(pm_source[i].flags & SRCFL_ENABLED))
-					continue;
+				{
+					if (isDedicated && !(pm_source[i].flags & SRCFL_DISABLED))
+						pm_source[i].flags |= SRCFL_ONCE;
+					else
+						continue;
+				}
 				pm_source[i].status = SRCSTAT_PENDING;
 			}
 			if (!allowphonehome)
@@ -4954,7 +5253,8 @@ void PM_Command_f(void)
 				p = PM_FindPackage(key);
 				if (p)
 				{
-					PM_MarkPackage(p, DPF_USERMARKED);
+					if (!PM_MarkPackage(p, DPF_USERMARKED))
+						Con_Printf("%s: unable to activate/mark %s\n", Cmd_Argv(0), key);
 					p->flags &= ~DPF_PURGE;
 				}
 				else
@@ -5060,7 +5360,7 @@ qboolean PM_FindUpdatedEngine(char *syspath, size_t syspathsize)
 
 				if (pfname && PM_CheckFile(pfname, p->fsroot))
 				{
-					if (FS_NativePath(pfname, p->fsroot, syspath, syspathsize))
+					if (FS_SystemPath(pfname, p->fsroot, syspath, syspathsize))
 					{
 						e = p;
 						best = them;
@@ -5115,7 +5415,7 @@ static const char *FS_RelativeURL(const char *base, const char *file, char *buff
 }
 
 //this function is called by the filesystem code to start downloading the packages listed by each manifest.
-void PM_AddManifestPackages(ftemanifest_t *man)
+void PM_AddManifestPackages(ftemanifest_t *man, qboolean mayapply)
 {
 	package_t *p, *m;
 	size_t i;
@@ -5248,7 +5548,7 @@ void PM_AddManifestPackages(ftemanifest_t *man)
 		}
 		PM_AddDep(p, dtype, path);
 
-		PM_ValidateAuthenticity(p, VH_UNSUPPORTED);
+		PM_ValidateAuthenticity(p, (man->security == MANIFEST_SECURITY_INSTALLER)?VH_CORRECT:VH_UNSUPPORTED);
 		if (p->flags & DPF_SIGNATUREACCEPTED)
 			p->flags |= DPF_TRUSTED;	//user confirmed it, engine trusts it, we're all okay with any exploits it may have...
 
@@ -5267,7 +5567,8 @@ void PM_AddManifestPackages(ftemanifest_t *man)
 	}
 
 	PM_ResortPackages();
-	PM_ApplyChanges();
+	if (mayapply)
+		PM_ApplyChanges();	//we reverted changes earlier, so the only packages added should have been from here.
 }
 
 #ifdef HAVE_CLIENT
@@ -5328,17 +5629,17 @@ void QCBUILTIN PF_cl_getpackagemanagerinfo(pubprogfuncs_t *prinst, struct global
 		case GPMI_AVAILABLE:
 #ifdef WEBCLIENT
 			if (PM_SignatureOkay(p) && !(p->flags&DPF_FORGETONUNINSTALL))
-				RETURN_TSTRING("1");
+				RETURN_SSTRING("1");
 #endif
 			break;
 
 		case GPMI_INSTALLED:
 			if (p->flags & DPF_CORRUPT)
-				RETURN_TSTRING("corrupt");	//some sort of error
+				RETURN_SSTRING("corrupt");	//some sort of error
 			else if (p->flags & DPF_ENABLED)
-				RETURN_TSTRING("enabled");	//its there (and in use)
+				RETURN_SSTRING("enabled");	//its there (and in use)
 			else if (p->flags & DPF_PRESENT)
-				RETURN_TSTRING("present");	//its there (but ignored)
+				RETURN_SSTRING("present");	//its there (but ignored)
 #ifdef WEBCLIENT
 			else if (p->download)
 			{	//we're downloading it
@@ -5348,7 +5649,7 @@ void QCBUILTIN PF_cl_getpackagemanagerinfo(pubprogfuncs_t *prinst, struct global
 					RETURN_TSTRING(va("%i%%", (int)p->download->qdownload.percent));	//we're downloading it.
 			}
 			else if (p->trymirrors)
-				RETURN_TSTRING("pending");	//its queued.
+				RETURN_SSTRING("pending");	//its queued.
 #endif
 			break;
 		case GPMI_GAMEDIR:
@@ -5359,20 +5660,44 @@ void QCBUILTIN PF_cl_getpackagemanagerinfo(pubprogfuncs_t *prinst, struct global
 			if (p->flags & DPF_PURGE)
 			{
 				if (p->flags & DPF_MARKED)
-					RETURN_TSTRING("reinstall");	//user wants to install it
+					RETURN_SSTRING("reinstall");	//user wants to install it
 				else
-					RETURN_TSTRING("purge");	//wiping it out
+					RETURN_SSTRING("purge");	//wiping it out
 			}
 			else if (p->flags & DPF_USERMARKED)
-				RETURN_TSTRING("user");	//user wants to install it
+				RETURN_SSTRING("user");	//user wants to install it
 			else if (p->flags & (DPF_AUTOMARKED|DPF_MANIMARKED))
-				RETURN_TSTRING("auto");	//enabled to satisfy a dependancy
+				RETURN_SSTRING("auto");	//enabled to satisfy a dependancy
 			else if (p->flags & DPF_ENABLED)
-				RETURN_TSTRING("disable");	//change from enabled to cached.
+				RETURN_SSTRING("disable");	//change from enabled to cached.
 			else if (p->flags & DPF_PRESENT)
-				RETURN_TSTRING("retain");	//keep it in cache
+				RETURN_SSTRING("retain");	//keep it in cache
 			//else not installed and don't want it.
 			break;
+		case GPMI_MAPS:
+			{
+				char buf[256];
+				char *maps = NULL;
+				struct packagedep_s *d;
+				for (d = p->deps; d; d = d->next)
+				{
+					if (d->dtype == DEP_MAP)
+					{
+						*buf = ' ';
+						COM_QuotedString(d->name, buf+1, sizeof(buf)-1, false);
+						if (maps)
+							Z_StrCat(&maps, buf);
+						else
+							Z_StrCat(&maps, buf+1);
+					}
+				}
+				if (maps)
+				{	//at least one map found.
+					RETURN_TSTRING(maps);
+					Z_Free(maps);
+				}
+			}
+			break;
 		}
 		return;
 	}
@@ -6032,16 +6357,10 @@ static int MD_AddItemsToDownloadMenu(emenu_t *m, int y, const char *pathprefix,
 				head = NULL;
 			if (p->filesize)
 			{
+				char buf[32];
 				if (!head)
 					head = "";
-				if (p->filesize < 1024)
-					head = va("%s^asize:^U00A0^a%.4f bytes\n", head, (double)p->filesize);
-				else if (p->filesize < 1024*1024)
-					head = va("%s^asize:^U00A0^a%.4f KB\n", head, (p->filesize/(1024.0)));
-				else if (p->filesize < 1024*1024*1024)
-					head = va("%s^asize:^U00A0^a%.4f MB\n", head, (p->filesize/(1024.0*1024)));
-				else
-					head = va("%s^asize:^U00A0^a%.4f GB\n", head, (p->filesize/(1024.0*1024*1024)));
+				head = va("%s^asize:^U00A0^a%s\n", head, FS_AbbreviateSize(buf,sizeof(buf), p->filesize));
 			}
 
 			for (dep = p->deps; dep; dep = dep->next)
diff --git a/engine/client/m_items.c b/engine/client/m_items.c
index 11ac18abe..67d32c1c6 100644
--- a/engine/client/m_items.c
+++ b/engine/client/m_items.c
@@ -480,7 +480,7 @@ static qboolean M_MouseMoved(emenu_t *menu)
 					if (opt2->common.posy + opt2->common.height > maxy)
 						maxy = opt2->common.posy + opt2->common.height;
 				}
-				maxy -= vid.height-8;
+				maxy -= vid.height;
 				framescroll += option->frame.frac * maxy;
 				ypos -= option->frame.frac * maxy;
 			}
@@ -682,16 +682,16 @@ static void MenuDrawItems(int xpos, int ypos, menuoption_t *option, emenu_t *men
 				int maxy = option->frame.common.posy;
 				option->frame.common.width = 16;
 				option->frame.common.posx = vid.width - option->frame.common.width - xpos;
-				option->frame.common.height = vid.height-8-maxy - ypos;
+				option->frame.common.height = vid.height-maxy - ypos;
 				for (opt2 = option->common.next; opt2; opt2 = opt2->common.next)
 				{
 					if (opt2->common.posy + opt2->common.height > maxy)
 						maxy = opt2->common.posy + opt2->common.height;
 				}
-				maxy -= vid.height-8;
+				maxy -= vid.height;
 				framescrollheight = maxy;
 
-				if (maxy < 0)
+				if (maxy <= 0)
 				{
 					option->frame.mousedown = false;
 					option->frame.frac = 0;
@@ -892,7 +892,10 @@ static void MenuDrawItems(int xpos, int ypos, menuoption_t *option, emenu_t *men
 static void MenuDraw(emenu_t *menu)
 {
 	if (!menu->dontexpand)
-		menu->xpos = ((vid.width - 320)>>1);
+	{
+		menu->width = min(vid.width,320);
+		menu->xpos = ((vid.width - menu->width)>>1);
+	}
 	if (menu->predraw)
 		menu->predraw(menu);
 	if (menu->selecteditem && menu->selecteditem->common.type == mt_text)
@@ -1771,8 +1774,8 @@ void MC_CheckBox_Key(menucheck_t *option, emenu_t *menu, int key)
 			else
 				Cvar_SetValue(option->var, !option->var->value);
 		}
-		S_LocalSound ("misc/menu2.wav");
 	}
+	S_LocalSound ("misc/menu2.wav");
 }
 
 void MC_EditBox_Key(menuedit_t *edit, int key, unsigned int unicode)
@@ -2401,10 +2404,15 @@ static int M_Main_AddExtraOptions(emenu_t *mainm, int y)
 #endif
 	}
 	if (Cmd_Exists("menu_mods"))
-	{
-		MC_AddConsoleCommandQBigFont(mainm, 72, y,	localtext("Mods          "), "menu_mods\n");	y += 20;
-		y += 20;
-	}
+		{MC_AddConsoleCommandQBigFont(mainm, 72, y,	localtext("Mods          "), "menu_mods\n");	y += 20;}
+
+	if (Cmd_Exists("sys_openfile"))
+		{MC_AddConsoleCommandQBigFont(mainm, 72, y,	localtext("Open File     "), "sys_openfile\n");	y += 20;}
+
+#ifdef FTE_TARGET_WEB
+	if (Cmd_Exists("xr_toggle"))
+		{MC_AddConsoleCommandQBigFont(mainm, 72, y,	localtext("Toggle WebXR  "), "xr_toggle\n");	y += 20;}
+#endif
 
 	return y;
 }
@@ -2716,8 +2724,10 @@ void M_Menu_Main_f (void)
 	b = NULL;
 	if (!b && !m_preset_chosen.ival)
 		b = M_FindButton(mainm, "menu_options\n");
+#ifdef PACKAGEMANAGER
 	if (!b && PM_AreSourcesNew(false))
 		b = M_FindButton(mainm, "menu_download\n");
+#endif
 	if (b)
 	{
 		mainm->selecteditem = (menuoption_t*)b;
diff --git a/engine/client/m_mp3.c b/engine/client/m_mp3.c
index f21e8d5ae..75dc1d408 100644
--- a/engine/client/m_mp3.c
+++ b/engine/client/m_mp3.c
@@ -2958,7 +2958,7 @@ static void *QDECL capture_raw_begin (char *streamname, int videorate, int width
 	else
 		Q_strncpyz(ctx->videonameextension, "tga", sizeof(ctx->videonameextension));
 
-	if (!FS_NativePath(va("%s", streamname), FS_GAMEONLY, ctx->videonameprefix, sizeof(ctx->videonameprefix)))
+	if (!FS_SystemPath(va("%s", streamname), FS_GAMEONLY, ctx->videonameprefix, sizeof(ctx->videonameprefix)))
 	{
 		Z_Free(ctx);
 		return NULL;
@@ -2970,8 +2970,7 @@ static void *QDECL capture_raw_begin (char *streamname, int videorate, int width
 	}
 	ctx->fsroot = FS_SYSTEM;
 
-	if (FS_NativePath(ctx->videonameprefix, ctx->fsroot, filename, sizeof(filename)))
-		FS_CreatePath(filename, ctx->fsroot);
+	FS_CreatePath(ctx->videonameprefix, ctx->fsroot);
 
 	ctx->audio = NULL;
 	if (*sndkhz)
@@ -3012,7 +3011,7 @@ static void QDECL capture_raw_video (void *vctx, int frame, void *data, int stri
 	{
 		char base[MAX_QPATH];
 		Q_strncpyz(base, ctx->videonameprefix, sizeof(base));
-		if (FS_NativePath(base, ctx->fsroot, filename, sizeof(filename)))
+		if (FS_SystemPath(base, ctx->fsroot, filename, sizeof(filename)))
 		{
 			quint64_t diskfree = 0;
 			if (Sys_GetFreeDiskSpace(filename, &diskfree))
@@ -3111,7 +3110,7 @@ static void *QDECL capture_avi_begin (char *streamname, int videorate, int width
 	COM_StripExtension(streamname, aviname, sizeof(aviname));
 	COM_DefaultExtension (aviname, ".avi", sizeof(aviname));
 	/*find the system location of that*/
-	FS_NativePath(aviname, FS_GAMEONLY, nativepath, sizeof(nativepath));
+	FS_SystemPath(aviname, FS_GAMEONLY, nativepath, sizeof(nativepath));
 
 	//wipe it.
 	f = fopen(nativepath, "rb");
diff --git a/engine/client/m_native.c b/engine/client/m_native.c
index 4627c787b..336508867 100644
--- a/engine/client/m_native.c
+++ b/engine/client/m_native.c
@@ -407,7 +407,7 @@ qboolean MN_Init(void)
 		VFS_GETS,
 		VFS_PRINTF,
 		COM_EnumerateFiles,
-		FS_NativePath,
+		FS_SystemPath,
 
 		// Drawing stuff
 		MN_DrawSetClipArea,
diff --git a/engine/client/m_options.c b/engine/client/m_options.c
index e9f028638..56657dfc8 100644
--- a/engine/client/m_options.c
+++ b/engine/client/m_options.c
@@ -1376,7 +1376,10 @@ void M_Menu_Preset_f (void)
 	emenu_t *menu;
 	int y;
 	menuoption_t *presetoption[7];
-	extern cvar_t r_nolerp, sv_nqplayerphysics, r_loadlits;
+	extern cvar_t r_nolerp, r_loadlits;
+#ifdef HAVE_SERVER
+	extern cvar_t sv_nqplayerphysics;
+#endif
 #if defined(RTLIGHTS) && (defined(GLQUAKE) || defined(VKQUAKE))
 	extern cvar_t r_bloom, r_shadow_realtime_world_importlightentitiesfrommap;
 #endif
@@ -2608,7 +2611,9 @@ static const char *mapoptions_h2[] =
 
 qboolean M_Apply_SP_Cheats_H2 (union menuoption_s *op,struct emenu_s *menu,int key)
 {
+#ifdef HAVE_SERVER
 	singleplayerh2info_t *info = menu->data;
+#endif
 
 	if (key != K_ENTER && key != K_KP_ENTER && key != K_GP_DIAMOND_CONFIRM && key != K_MOUSE1 && key != K_TOUCHTAP)
 		return false;
@@ -2642,21 +2647,20 @@ qboolean M_Apply_SP_Cheats_H2 (union menuoption_s *op,struct emenu_s *menu,int k
 
 void M_Menu_Singleplayer_Cheats_Hexen2 (void)
 {
-	static const char *skilloptions[] =
-	{
-		"Easy",
-		"Normal",
-		"Hard",
-		"Nightmare",
-		"None Set",
-		NULL
-	};
-
 	singleplayerh2info_t *info;
 	int cursorpositionY;
-	int currentmap;
 	#ifdef HAVE_SERVER
+		int currentmap;
 		int currentskill;
+		static const char *skilloptions[] =
+		{
+			"Easy",
+			"Normal",
+			"Hard",
+			"Nightmare",
+			"None Set",
+			NULL
+		};
 		extern cvar_t sv_gravity, sv_cheats, sv_maxspeed, skill;
 	#endif
 	int y;
@@ -3382,6 +3386,7 @@ typedef struct
 
 	char modelname[MAX_QPATH];
 	char skinname[MAX_QPATH];
+	char animname[MAX_QPATH];
 
 	char shaderfile[MAX_QPATH];
 	char *shadertext;
@@ -3498,12 +3503,14 @@ static void M_ModelViewerDraw(int x, int y, struct menucustom_s *c, struct emenu
 	skinfile_t *skin;
 	texnums_t *texnums;
 	qboolean boneanimsonly;
+	model_t *animmodel = NULL;
 
 	if (R2D_Flush)
 		R2D_Flush();
 
 	memset(&pv, 0, sizeof(pv));
 
+	Alias_FlushCache();	//doesn't like us using stack...
 	CL_DecayLights ();
 	CL_ClearEntityLists();
 	V_ClearRefdef(&pv);
@@ -3571,7 +3578,12 @@ static void M_ModelViewerDraw(int x, int y, struct menucustom_s *c, struct emenu
 		return;	//panic!
 
 	if (ent.model->type == mod_alias)	//should we even bother with this here?
+	{
+		if (*mods->animname)
+			animmodel = Mod_ForName(mods->animname, MLV_WARN);
+
 		AngleVectorsMesh(ent.angles, ent.axis[0], ent.axis[1], ent.axis[2]);
+	}
 	else
 		AngleVectors(ent.angles, ent.axis[0], ent.axis[1], ent.axis[2]);
 	VectorInverse(ent.axis[1]);
@@ -3608,7 +3620,14 @@ static void M_ModelViewerDraw(int x, int y, struct menucustom_s *c, struct emenu
 	ent.framestate.g[FS_REG].frametime[0] = ent.framestate.g[FS_REG].frametime[1] = realtime - mods->framechangetime;
 	ent.framestate.g[FS_REG].endbone = 0x7fffffff;
 	if (*mods->skinname)
+	{
 		ent.customskin = Mod_RegisterSkinFile(mods->skinname);	//explicit .skin file to use
+		if (!ent.customskin)
+		{
+			Con_Printf(CON_WARNING"Named skinfile not loaded\n");
+			*mods->skinname = 0;	//don't spam.
+		}
+	}
 	else
 	{
 		ent.customskin = Mod_RegisterSkinFile(va("%s_%i.skin", mods->modelname, ent.skinnum));
@@ -3700,6 +3719,18 @@ static void M_ModelViewerDraw(int x, int y, struct menucustom_s *c, struct emenu
 	}
 #endif
 
+	if (animmodel)// && Mod_GetNumBones(ent.model, false)==Mod_GetNumBones(animmodel, false))
+	{
+		int numbones = Mod_GetNumBones(ent.model, false);
+		galiasbone_t *boneinfo = Mod_GetBoneInfo(ent.model, &numbones);
+		float *bonematrix = alloca(numbones*sizeof(*bonematrix)*12);
+		ent.framestate.bonecount = Mod_GetBoneRelations(animmodel, 0, numbones, boneinfo, &ent.framestate, bonematrix);
+		ent.framestate.bonestate = bonematrix;
+		ent.framestate.skeltype = SKEL_RELATIVE;
+	}
+	else
+		animmodel = ent.model;	//not using it. sorry. warn?
+
 
 	if (mods->mode == MV_NORMALS)
 	{
@@ -3898,8 +3929,10 @@ static void M_ModelViewerDraw(int x, int y, struct menucustom_s *c, struct emenu
 		float duration = 0;
 		qboolean loop = false;
 		int act = -1;
-		if (!Mod_FrameInfoForNum(ent.model, mods->surfaceidx, mods->framegroup, &fname, &numframes, &duration, &loop, &act))
+		if (!Mod_FrameInfoForNum(animmodel, mods->surfaceidx, mods->framegroup, &fname, &numframes, &duration, &loop, &act))
 			fname = "Unknown Sequence";
+		if (animmodel != ent.model)
+			fname = va("^[%s^] %s", animmodel->name, fname);	//tag it properly if its from our animmodel
 		if (act != -1)
 			Draw_FunString(0, y, va("Frame%i[%i]: %s (%i poses, %f of %f secs, %s)", mods->framegroup, act, fname, numframes, ent.framestate.g[FS_REG].frametime[0], duration, loop?"looped":"unlooped"));
 		else
@@ -4032,17 +4065,18 @@ static void M_ModelViewerDraw(int x, int y, struct menucustom_s *c, struct emenu
 			char *data = NULL;
 			Draw_FunString(0, y, va("Events: "));
 			y+=8;
-			for (i = 0; Mod_GetModelEvent(ent.model, mods->framegroup, i, &timestamp, &code, &data); y+=8, i++)
+			for (i = 0; Mod_GetModelEvent(animmodel, mods->framegroup, i, &timestamp, &code, &data); y+=8, i++)
 			{
 				Draw_FunString(0, y, va("%i %f: %i %s", i, timestamp, code, data));
 			}
-			Draw_FunString(0, y, va("%f: <end of animation>", Mod_GetFrameDuration(ent.model, 0, mods->framegroup)));
+			Draw_FunString(0, y, va("%f: <end of animation>", Mod_GetFrameDuration(animmodel, 0, mods->framegroup)));
 		}
 		break;
 	case MV_SHADER:
 		{
 			if (!mods->shadertext)
 			{
+				char *cr;
 				char *body = Shader_GetShaderBody(Mod_ShaderForSkin(ent.model, mods->surfaceidx, mods->skingroup, r_refdef.time, &texnums), mods->shaderfile, sizeof(mods->shaderfile));
 				if (!body)
 				{
@@ -4052,9 +4086,12 @@ static void M_ModelViewerDraw(int x, int y, struct menucustom_s *c, struct emenu
 				if (*mods->shaderfile)
 					mods->shadertext = Z_StrDupf("\n\nPress space to view+edit the shader\n\n%s", body);
 				else
-					mods->shadertext = Z_StrDupf("{%s",body);
+					mods->shadertext = Z_StrDupf("{ %s",body);
+
+				while ((cr = strchr(mods->shadertext, '\r')))
+					*cr = ' ';
 			}
-			R_DrawTextField(r_refdef.grect.x, r_refdef.grect.y+16, r_refdef.grect.width, r_refdef.grect.height-16, mods->shadertext, CON_WHITEMASK, CPRINT_TALIGN|CPRINT_LALIGN, font_default, fs);
+			R_DrawTextField(r_refdef.grect.x, r_refdef.grect.y+24, r_refdef.grect.width, r_refdef.grect.height-16, mods->shadertext, CON_WHITEMASK, CPRINT_TALIGN|CPRINT_LALIGN, font_default, fs);
 
 			//fixme: draw the shader's textures.
 		}
@@ -4333,6 +4370,12 @@ void M_Menu_ModelViewer_f(void)
 	menucustom_t *c;
 	emenu_t *menu;
 
+	if (!*Cmd_Argv(1))
+	{
+		Con_Printf("modelviewer <MODELNAME> [SKINFILE] [ANIMATIONFILE]\n");
+		return;
+	}
+
 	menu = M_CreateMenu(sizeof(*mv));
 	menu->menu.persist = true;
 	mv = menu->data;
@@ -4345,6 +4388,7 @@ void M_Menu_ModelViewer_f(void)
 	mv->dist = 150;
 	Q_strncpyz(mv->modelname, Cmd_Argv(1), sizeof(mv->modelname));
 	Q_strncpyz(mv->skinname, Cmd_Argv(2), sizeof(mv->skinname));
+	Q_strncpyz(mv->animname, Cmd_Argv(3), sizeof(mv->animname));
 
 	mv->framechangetime = realtime;
 	mv->skinchangetime = realtime;
@@ -4406,42 +4450,57 @@ static void Mods_Draw(int x, int y, struct menucustom_s *c, struct emenu_s *m)
 {
 	int i = c->dint;
 	struct modlist_s *mod = Mods_GetMod(i);
-	c->common.width = vid.width - x - 16;
 
 	if (!mod && !i)
 	{
 		float scale[] = {8,8};
-		R_DrawTextField(0, y, vid.width, vid.height - y,
+
+		m->height = vid.height;
+
+		if (y==0)
+		{	//just take the full screen.
+			y = m->ypos;
+			c->common.posy = 0;
+			c->common.height = m->height;
+
+			m->dontexpand = true;
+			m->xpos = x = 0;
+			m->width = vid.width;
+		}
+		else
+		{	//at least expand it.
+			c->common.height = m->height - c->common.posy;
+		}
+
+		//take the full width of the menu
+		x = m->xpos;
+		c->common.posx = 0;
+		c->common.width = m->width;
+
+		R_DrawTextField(x, y, c->common.width, c->common.height,
 					va(
 					"No games or mods known.\n"
-#if defined(FTE_TARGET_WEB)
-					"Connection issue or bad server config.\n"
+#ifdef FTE_TARGET_WEB
+					"Try providing packages/gamedirs via drag+drop.\n"
+					"%s", Cmd_Exists("sys_openfile")?"Or click to add a package\n":""
 #else
 	#ifndef ANDROID
 					"You may need to use -basedir $PATHTOGAME on the commandline.\n"
 	#endif
 					"\nExpected data path:\n^a%s", com_gamepath
 #endif
-					), CON_WHITEMASK, 0, font_console, scale);
+					), CON_WHITEMASK, 0, font_default, scale);
 		return;
 	}
+	c->common.height = 8;
+	c->common.width = vid.width - x - 16;
 
 	if (!mod)
 		return;
 	if (mod->manifest)
-	{
-		if (m->selecteditem == (menuoption_t*)c)
-			Draw_AltFunString(x, y, mod->manifest->formalname);
-		else
-			Draw_FunString(x, y, mod->manifest->formalname);
-	}
+		Draw_FunStringWidth(x, y, mod->manifest->formalname, c->common.width, 0, m->selecteditem == (menuoption_t*)c);
 	else
-	{
-		if (m->selecteditem == (menuoption_t*)c)
-			Draw_AltFunString(x, y, mod->gamedir);
-		else
-			Draw_FunString(x, y, mod->gamedir);
-	}
+		Draw_FunStringWidth(x, y, mod->gamedir, c->common.width, 0, m->selecteditem == (menuoption_t*)c);
 }
 static qboolean Mods_Key(struct menucustom_s *c, struct emenu_s *m, int key, unsigned int unicode)
 {
@@ -4450,7 +4509,11 @@ static qboolean Mods_Key(struct menucustom_s *c, struct emenu_s *m, int key, uns
 	{
 		qboolean wasgameless = !*FS_GetGamedir(false);
 		if (!Mods_GetMod(c->dint))
+		{
+			if (Cmd_Exists("sys_openfile"))
+				Cbuf_AddText("sys_openfile\n", RESTRICT_LOCAL);
 			return false;
+		}
 		M_RemoveMenu(m);
 
 		Cbuf_AddText(va("\nfs_changegame %u\n", gameidx+1), RESTRICT_LOCAL);
@@ -4471,6 +4534,7 @@ void M_Menu_Mods_f (void)
 	menucustom_t *c;
 	emenu_t *menu;
 	size_t i;
+	int y;
 
 	//FIXME: sort by mtime?
 
@@ -4479,20 +4543,23 @@ void M_Menu_Mods_f (void)
 	{
 		MC_AddPicture(menu, 16, 4, 32, 144, "gfx/qplaque.lmp");
 		MC_AddCenterPicture(menu, 0, 24, "gfx/p_option.lmp");
+		y = 32;
 	}
+	else
+		y = 0;
 
-	MC_AddFrameStart(menu, 32);
+	MC_AddFrameStart(menu, y);
 	for (i = 0; i<1 || Mods_GetMod(i); i++)
 	{
 		struct modlist_s *mod = Mods_GetMod(i);
-		c = MC_AddCustom(menu, 64, 32+i*8, menu->data, i, (mod&&mod->manifest)?mod->manifest->basedir:NULL);
+		c = MC_AddCustom(menu, 64, y+i*8, menu->data, i, (mod&&mod->manifest)?mod->manifest->basedir:NULL);
 //		if (!menu->selecteditem)
 //			menu->selecteditem = (menuoption_t*)c;
 		c->common.height = 8;
 		c->draw = Mods_Draw;
 		c->key = Mods_Key;
 	}
-	MC_AddFrameEnd(menu, 32);
+	MC_AddFrameEnd(menu, y);
 }
 
 #if 0
@@ -4532,7 +4599,7 @@ static qboolean Installer_Go(menuoption_t *opt, menu_t *menu, int key)
 
 #ifdef _WIN32
 		GetModuleFileNameW(NULL, exepath, sizeof(exepath));
-		FS_NativePath(va("%s.exe", fs_manifest->installation), FS_ROOT, newexepath, sizeof(newexepath));
+		FS_SystemPath(va("%s.exe", fs_manifest->installation), FS_ROOT, newexepath, sizeof(newexepath));
 		CopyFileW(exepath, newexepath, FALSE);
 
 //		SetHookState(false);
diff --git a/engine/client/m_script.c b/engine/client/m_script.c
index 6356e7649..5200d87c1 100644
--- a/engine/client/m_script.c
+++ b/engine/client/m_script.c
@@ -20,7 +20,7 @@ void M_Script_Option (emenu_t *menu, char *optionvalue, qboolean isexplicit)
 
 	Cbuf_AddText("wait\n", execlevel);
 
-	if (!*scriptname)
+	if (!scriptname || !*scriptname)
 	{
 		if (isexplicit)
 			Cbuf_AddText(va("%s\n", optionvalue), execlevel);
diff --git a/engine/client/m_single.c b/engine/client/m_single.c
index 77801dff4..800d4a950 100644
--- a/engine/client/m_single.c
+++ b/engine/client/m_single.c
@@ -319,11 +319,10 @@ void M_Menu_Load_f (void)
 void M_Menu_SinglePlayer_f (void)
 {
 	emenu_t *menu;
-#ifndef CLIENTONLY
+#ifdef HAVE_SERVER
 	menubutton_t *b;
 	mpic_t *p;
 	static menuresel_t resel;
-#endif
 
 #if MAX_SPLITS > 1
 	static const char *splitopts[] =
@@ -344,15 +343,6 @@ void M_Menu_SinglePlayer_f (void)
 		};
 #endif
 
-#ifdef CLIENTONLY
-	menu = M_CreateMenu(0);
-
-	MC_AddWhiteText(menu, 84, 0, 12*8, "This build is unable", false);
-	MC_AddWhiteText(menu, 84, 0, 13*8, "to start a local game", false);
-
-	MC_AddBox (menu, 60, 11*8, 25*8, 4*8);
-#else
-
 	switch(M_GameType())
 	{
 #ifdef Q2CLIENT
@@ -580,6 +570,14 @@ void M_Menu_SinglePlayer_f (void)
 
 		menu->cursoritem = (menuoption_t*)MC_AddCursor(menu, &resel, 54, 32);
 	}
+
+#else
+	menu = M_CreateMenu(0);
+
+	MC_AddWhiteText(menu, 84, 0, 12*8, "This build is unable", false);
+	MC_AddWhiteText(menu, 84, 0, 13*8, "to start a local game", false);
+
+	MC_AddBox (menu, 60, 11*8, 25*8, 4*8);
 #endif
 }
 
@@ -626,9 +624,9 @@ static void M_DemoDraw(int x, int y, menucustom_t *control, emenu_t *menu)
 	demoitem_t *item, *lostit;
 	int ty;
 
-	char syspath[MAX_OSPATH];
-	if (FS_NativePath(info->fs->path, (info->fs->fsroot==FS_GAME)?FS_GAMEONLY:info->fs->fsroot, syspath, sizeof(syspath)))
-		Draw_FunString(x, y-16, syspath);
+	char displaypath[MAX_OSPATH];
+	if (FS_DisplayPath(info->fs->path, (info->fs->fsroot==FS_GAME)?FS_GAMEONLY:info->fs->fsroot, displaypath, sizeof(displaypath)))
+		Draw_FunString(x, y-16, displaypath);
 
 	ty = vid.height-24;
 	item = info->selected;
@@ -1021,7 +1019,7 @@ static void ShowDemoMenu (emenu_t *menu, const char *path)
 	{
 		if (!strcmp(path, "../"))
 		{
-			FS_NativePath("", FS_ROOT, info->fs->path, sizeof(info->fs->path));
+			FS_SystemPath("", FS_ROOT, info->fs->path, sizeof(info->fs->path));
 			Q_strncatz(info->fs->path, "../", sizeof(info->fs->path));
 			info->fs->fsroot = FS_SYSTEM;
 			while((s = strchr(info->fs->path, '\\')))
diff --git a/engine/client/menu.c b/engine/client/menu.c
index bcce14c23..1ca48fba1 100644
--- a/engine/client/menu.c
+++ b/engine/client/menu.c
@@ -21,6 +21,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "winquake.h"
 #include "shader.h"
 #include "cl_master.h"
+#ifdef FTE_TARGET_WEB
+#include <emscripten/emscripten.h>
+#endif
 
 menu_t *topmenu;
 menu_t *promptmenu;
@@ -1302,10 +1305,8 @@ void M_Menu_Quit_f (void)
 	switch(mode)
 	{
 	case 0:
-#ifndef FTE_TARGET_WEB
 		CL_Disconnect (NULL);
 		Sys_Quit ();
-#endif
 		break;
 	case 2:
 		Menu_Prompt (M_Menu_DoQuitSave, NULL, localtext("You have unsaved settings\nWould you like to\nsave them now?"), "Yes", "No", "Cancel", true);
diff --git a/engine/client/menu.h b/engine/client/menu.h
index f316e5931..806a32213 100644
--- a/engine/client/menu.h
+++ b/engine/client/menu.h
@@ -131,7 +131,12 @@ typedef enum
 	PROMPT_NO		= 1,
 	PROMPT_CANCEL	= -1,
 } promptbutton_t;
+#ifdef HAVE_CLIENT
 void Menu_Prompt (void (*callback)(void *, promptbutton_t), void *ctx, const char *messages, const char *optionyes, const char *optionno, const char *optioncancel, qboolean highpri);
+#define Menu_PromptOrPrint(messages,optioncancel,highpri) Menu_Prompt(NULL, NULL, messages, NULL, NULL, optioncancel, highpri)
+#else
+#define Menu_PromptOrPrint(messages,optioncancel,highpri) Con_Printf("%s", messages)
+#endif
 
 #ifndef NOBUILTINMENUS
 
diff --git a/engine/client/merged.h b/engine/client/merged.h
index 257c8f766..7d8e75986 100644
--- a/engine/client/merged.h
+++ b/engine/client/merged.h
@@ -209,7 +209,7 @@ extern int Mod_TagNumForName					(struct model_s *model, const char *name, int f
 
 void Mod_AddSingleSurface(struct entity_s *ent, int surfaceidx, shader_t *shader, int mode);
 int Mod_GetNumBones(struct model_s *model, qboolean allowtags);
-int Mod_GetBoneRelations(struct model_s *model, int firstbone, int lastbone, framestate_t *fstate, float *result);
+int Mod_GetBoneRelations(struct model_s *model, int firstbone, int lastbone, const struct galiasbone_s *boneinfo, const framestate_t *fstate, float *result);
 int Mod_GetBoneParent(struct model_s *model, int bonenum);
 struct galiasbone_s *Mod_GetBoneInfo(struct model_s *model, int *numbones);
 const char *Mod_GetBoneName(struct model_s *model, int bonenum);
@@ -222,11 +222,6 @@ void Draw_FunStringWidthFont(struct font_s *font, float x, float y, const void *
 
 extern int r_regsequence;
 
-#ifdef SERVERONLY
-#define Mod_Q1LeafPVS Mod_LeafPVS
-// qbyte *Mod_LeafPVS (struct mleaf_s *leaf, struct model_s *model, qbyte *buffer);
-#endif
-
 enum
 {
 	TEX_NOTLOADED,
@@ -314,13 +309,13 @@ struct pendingtextureinfo
 
 	uploadfmt_t encoding;	//PTI_* formats
 	void *extrafree;		//avoids some memcpys
-	int mipcount;
+	unsigned int mipcount;
 	struct
 	{
 		void *data;
 		size_t datasize; //ceil(width/blockwidth)*ceil(height/blockheight)*ceil(depth/blockdepth)*blocksize - except that blockdepth is always considered 1 for now.
-		int width;
-		int height;
+		unsigned int width;
+		unsigned int height;
 		int depth;
 		qboolean needfree;
 	} mip[72];	//enough for a 4096 cubemap. or a really smegging big 2d texture...
diff --git a/engine/client/modelgen.h b/engine/client/modelgen.h
index 0cfd748ef..6f0dda863 100644
--- a/engine/client/modelgen.h
+++ b/engine/client/modelgen.h
@@ -53,7 +53,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 typedef enum {ST_SYNC=0, ST_RAND } synctype_t;
 #endif
 
-typedef enum { ALIAS_SINGLE=0, ALIAS_GROUP, ALIAS_GROUP_SWAPPED=16777216 } aliasframetype_t;
+typedef enum { ALIAS_SINGLE=0, ALIAS_GROUP, ALIAS_GROUP_SWAPPED=0x01000000 } aliasframetype_t;
 
 typedef enum { ALIAS_SKIN_SINGLE=0, ALIAS_SKIN_GROUP } aliasskintype_t;
 
diff --git a/engine/client/net_master.c b/engine/client/net_master.c
index 2dd686fd9..966b86194 100644
--- a/engine/client/net_master.c
+++ b/engine/client/net_master.c
@@ -169,10 +169,10 @@ static net_masterlist_t net_masterlist[] = {
 //	{MP_QUAKEWORLD, CVARFC("net_qwmasterextraHistoric",	"master.teamdamage.com:27000",				CVAR_NOSAVE, Net_Masterlist_Callback),	"master.teamdamage.com"},
 
 	//Total conversions will need to define their own in defaults.cfg or whatever.
-	{MP_DPMASTER,	CVARFC("net_masterextra1",		"master.frag-net.com:27950 198.58.111.37:27950",								CVAR_NOSAVE, Net_Masterlist_Callback)}, //admin: Eukara
-//	{MP_DPMASTER,	CVARFC("net_masterextra1",		""/*"ghdigital.com:27950 207.55.114.154:27950"*/,								CVAR_NOSAVE, Net_Masterlist_Callback)}, //(was 69.59.212.88) admin: LordHavoc
-	{MP_DPMASTER,	CVARFC("net_masterextra2",		"dpmaster.deathmask.net:27950 107.161.23.68:27950 [2604:180::4ac:98c1]:27950",	CVAR_NOSAVE, Net_Masterlist_Callback)}, //admin: Willis
-	{MP_DPMASTER,	CVARFC("net_masterextra3",		"dpmaster.tchr.no:27950 92.62.40.73:27950",										CVAR_NOSAVE, Net_Masterlist_Callback)}, //admin: tChr
+	{MP_DPMASTER,	CVARFC("net_masterextra1",		"master.frag-net.com:27950",					CVAR_NOSAVE, Net_Masterlist_Callback)}, //admin: Eukara
+//	{MP_DPMASTER,	CVARFC("net_masterextra1",		""/*"ghdigital.com:27950"*/,					CVAR_NOSAVE, Net_Masterlist_Callback)}, //(was 69.59.212.88) admin: LordHavoc
+	{MP_DPMASTER,	CVARFC("net_masterextra2",		"dpmaster.deathmask.net:27950",					CVAR_NOSAVE, Net_Masterlist_Callback)}, //admin: Willis
+	{MP_DPMASTER,	CVARFC("net_masterextra3",		"dpmaster.tchr.no:27950",						CVAR_NOSAVE, Net_Masterlist_Callback)}, //admin: tChr
 #else
 	{MP_DPMASTER,	CVARFC("net_masterextra1",		"",												CVAR_NOSAVE, Net_Masterlist_Callback)},
 	{MP_DPMASTER,	CVARFC("net_masterextra2",		"",												CVAR_NOSAVE, Net_Masterlist_Callback)},
@@ -376,8 +376,8 @@ static void SV_Master_SingleHeartbeat(net_masterlist_t *master)
 					{
 						COM_Parse(master->cv.string);
 						Con_TPrintf (S_COLOR_GRAY"Sending heartbeat to %s (%s)\n", NET_AdrToString (adr, sizeof(adr), na), com_token);
+						master->announced = true;
 					}
-					master->announced = true;
 				}
 				break;
 			case NETERR_NOROUTE:
@@ -387,8 +387,8 @@ static void SV_Master_SingleHeartbeat(net_masterlist_t *master)
 					{
 						COM_Parse(master->cv.string);
 						Con_TPrintf (CON_WARNING"No route for heartbeat to %s (%s)\n", NET_AdrToString (adr, sizeof(adr), na), com_token);
+						master->announced = true;
 					}
-					master->announced = true;
 				}
 				break;
 			default:
@@ -401,8 +401,8 @@ static void SV_Master_SingleHeartbeat(net_masterlist_t *master)
 					{
 						COM_Parse(master->cv.string);
 						Con_TPrintf (CON_ERROR"Failed to send heartbeat to %s (%s)\n", NET_AdrToString (adr, sizeof(adr), na), com_token);
+						master->announced = true;
 					}
-					master->announced = true;
 				}
 				break;
 			}
@@ -663,6 +663,17 @@ static void SV_Master_Add(int type, char *stringadr)
 {
 	int i;
 
+	//don't do dupes...
+	for (i = 0; net_masterlist[i].cv.name; i++)
+	{
+		if (net_masterlist[i].protocol == type)
+			if (!strcmp(net_masterlist[i].cv.string, stringadr))
+			{
+				svs.last_heartbeat = -99999;
+				return;
+			}
+	}
+
 	for (i = 0; net_masterlist[i].cv.name; i++)
 	{
 		if (net_masterlist[i].protocol != type)
@@ -680,6 +691,7 @@ static void SV_Master_Add(int type, char *stringadr)
 	}
 
 	Cvar_Set(&net_masterlist[i].cv, stringadr);
+	Con_Printf(CON_WARNING"setting %s to \"%s\"\n", net_masterlist[i].cv.name, stringadr);
 
 	svs.last_heartbeat = -99999;
 }
@@ -693,6 +705,8 @@ static void SV_Master_ClearType(int type)
 		{
 			if (net_masterlist[i].cv.flags & CVAR_NOSAVE)
 				continue;	//ignore our extras
+			if (*net_masterlist[i].cv.string)
+				Con_Printf(CON_WARNING"clearing %s (was \"%s\")\n", net_masterlist[i].cv.name, net_masterlist[i].cv.string);
 			Cvar_Set(&net_masterlist[i].cv, "");
 		}
 	}
@@ -733,7 +747,8 @@ static void SV_SetMaster_f (void)
 		return;
 	}
 
-	Cvar_Set(&sv_public, "1");	//go public.
+	if (sv_public.ival < 1)
+		Con_Printf(CON_WARNING"%s used on private server (sv_public is \"%s\")\n", Cmd_Argv(0), sv_public.string);
 	if (!strcmp(Cmd_Argv(1), "default"))
 	{
 		for (i = 0; net_masterlist[i].cv.name; i++)
@@ -741,8 +756,12 @@ static void SV_SetMaster_f (void)
 		return;
 	}
 
-	SV_Master_ClearType(MP_QUAKEWORLD);
-	for (i=1 ; i<Cmd_Argc() ; i++)
+	i = 1;
+	if (!strcmp(Cmd_Argv(1), "add"))
+		i++;
+	else
+		SV_Master_ClearType(MP_QUAKEWORLD);
+	for ( ; i<Cmd_Argc() ; i++)
 	{
 		SV_Master_Add(MP_QUAKEWORLD, Cmd_Argv(i));
 	}
@@ -2738,7 +2757,7 @@ static void MasterInfo_ProcessHTTP(struct dl_download *dl)
 			infostring = NULL;
 
 		if (!strncmp(s, "ice:///", 7) || !strncmp(s, "ices:///", 8) || !strncmp(s, "rtc:///", 7) || !strncmp(s, "rtcs:///", 8))
-		{
+		{	//implicitly using the ip:port of the responder, instead of that being specified (giving a consistent route to it instead of it having to guess what hostname we used).
 			brokerid = s+((s[4]==':')?7:6);
 			adr = brokeradr;
 			if (!*brokerid)
@@ -2749,6 +2768,13 @@ static void MasterInfo_ProcessHTTP(struct dl_download *dl)
 			brokerid = s;
 			adr = brokeradr;
 		}
+#ifndef HAVE_PACKET
+		else if ((*s=='[' || (*s >= '0' && *s <= '9')) && infostring)
+		{	//if we don't have support for udp packets here, convert any raw address to an rtc:///udp/ADDRESS one instead, via this master's brokering services... hopefully.
+			brokerid = va("/udp/%s", s);
+			adr = brokeradr;
+		}
+#endif
 		else
 		{
 			if (!NET_StringToAdr2(s, 80, &adr, 1, &brokerid))
@@ -3752,6 +3778,7 @@ void CL_MasterListParse(netadrtype_t adrtype, int type, qboolean slashpad)
 	firstserver = last;
 }
 #else
+void Master_QueryServer(serverinfo_t *server){}
 qboolean CL_QueryServers(void)
 {
 	master_t *mast;
diff --git a/engine/client/p_script.c b/engine/client/p_script.c
index 13d615af3..f89ce6f38 100644
--- a/engine/client/p_script.c
+++ b/engine/client/p_script.c
@@ -2651,7 +2651,7 @@ static void P_ExportAllEffects_f(void)
 	outf = FS_OpenVFS(fname, "wb", FS_GAMEONLY);
 	if (!outf)
 	{
-		FS_NativePath(fname, FS_GAMEONLY, effect, sizeof(effect));
+		FS_DisplayPath(fname, FS_GAMEONLY, effect, sizeof(effect));
 		Con_TPrintf("Unable to open file %s\n", effect);
 		return;
 	}
@@ -2679,7 +2679,7 @@ static void P_ExportAllEffects_f(void)
 	}
 	VFS_CLOSE(outf);
 
-	FS_NativePath(fname, FS_GAMEONLY, effect, sizeof(effect));
+	FS_DisplayPath(fname, FS_GAMEONLY, effect, sizeof(effect));
 	Con_Printf("Written %s\n", effect);
 }
 #endif
@@ -3398,7 +3398,7 @@ static void P_ConvertEffectInfo_f(void)
 	outf = FS_OpenVFS(fname, "wb", FS_GAMEONLY);
 	if (!outf)
 	{
-		FS_NativePath(fname, FS_GAMEONLY, effect, sizeof(effect));
+		FS_DisplayPath(fname, FS_GAMEONLY, effect, sizeof(effect));
 		Con_TPrintf("Unable to open file %s\n", effect);
 		return;
 	}
@@ -3435,7 +3435,7 @@ static void P_ConvertEffectInfo_f(void)
 	}
 	VFS_CLOSE(outf);
 
-	FS_NativePath(fname, FS_GAMEONLY, effect, sizeof(effect));
+	FS_DisplayPath(fname, FS_GAMEONLY, effect, sizeof(effect));
 	Con_Printf("Written %s\n", effect);
 }
 #endif
@@ -3534,10 +3534,10 @@ static void PScript_Shutdown (void)
 	Cmd_RemoveCommand("r_exportbuiltinparticles");
 	Cmd_RemoveCommand("r_importeffectinfo");
 
-#if _DEBUG
+//#if _DEBUG
 	Cmd_RemoveCommand("r_partinfo");
 	Cmd_RemoveCommand("r_beaminfo");
-#endif
+//#endif
 
 	pe_default			= P_INVALID;
 	pe_size2			= P_INVALID;
@@ -3809,7 +3809,7 @@ static void QDECL R_ParticleDesc_Callback(struct cvar_s *var, char *oldvalue)
 			if (failure)
 			P_LoadParticleSet("high", true, true);
 
-		if (cls.state)
+		if (cls.state && cl.model_name[1])
 		{
 			//per-map configs. because we can.
 			memcpy(token, "map_", 4);
diff --git a/engine/client/pr_clcmd.c b/engine/client/pr_clcmd.c
index 9edaa5705..ce6d0d049 100644
--- a/engine/client/pr_clcmd.c
+++ b/engine/client/pr_clcmd.c
@@ -542,7 +542,6 @@ void QCBUILTIN PF_cl_playingdemo (pubprogfuncs_t *prinst, struct globalvars_s *p
 		G_FLOAT(OFS_RETURN) = 0;
 		break;
 	case DPB_MVD:
-	case DPB_EZTV:
 		G_FLOAT(OFS_RETURN) = 2;
 		break;
 	default:
diff --git a/engine/client/pr_csqc.c b/engine/client/pr_csqc.c
index 22285a3d6..3c86f0fd2 100644
--- a/engine/client/pr_csqc.c
+++ b/engine/client/pr_csqc.c
@@ -221,15 +221,15 @@ static void CSQC_FindGlobals(qboolean nofuncs)
 #undef globalstring
 #undef globalfunction
 
-#define ensurefloat(name)	if (!csqcg.name) csqcg.name = &junk._float;
-#define ensureint(name)		if (!csqcg.name) csqcg.name = &junk._int;
-#define ensurevector(name)	if (!csqcg.name) csqcg.name = junk._vector;
-#define ensureentity(name)	if (!csqcg.name) csqcg.name = &junk.edict;
+#define ensurefloat(name)	do{if (!csqcg.name) csqcg.name = &junk._float;}while(0)
+#define ensureint(name)		do{if (!csqcg.name) csqcg.name = &junk._int;  }while(0)
+#define ensurevector(name)	do{if (!csqcg.name) csqcg.name = junk._vector;}while(0)
+#define ensureentity(name)	do{if (!csqcg.name) csqcg.name = &junk.edict; }while(0)
 
-#define ensureprivfloat(name)	if (!csqcg.name) {static pvec_t f; csqcg.name = &f;}
-#define ensureprivint(name)		if (!csqcg.name) {static pint_t i; csqcg.name = &i;}
-#define ensureprivvector(name)	if (!csqcg.name) {static pvec3_t v; csqcg.name = v;}
-#define ensurepriventity(name)	if (!csqcg.name) {static pint_t e; csqcg.name = &e;}
+#define ensureprivfloat(name)	do{if (!csqcg.name) {static pvec_t f; csqcg.name = &f;}}while(0)
+#define ensureprivint(name)		do{if (!csqcg.name) {static pint_t i; csqcg.name = &i;}}while(0)
+#define ensureprivvector(name)	do{if (!csqcg.name) {static pvec3_t v; csqcg.name = v;}}while(0)
+#define ensurepriventity(name)	do{if (!csqcg.name) {static pint_t e; csqcg.name = &e;}}while(0)
 
 	if (csqc_nogameaccess)
 	{
@@ -698,6 +698,8 @@ static int CS_FindModel(const char *name, int *free)
 	}
 	for (i = 1; i < MAX_PRECACHE_MODELS; i++)
 	{
+		if (!cl.model_name[i])
+			break;
 		if (!strcmp(cl.model_name[i], name))
 			return i;
 	}
@@ -2733,44 +2735,47 @@ static void QCBUILTIN PF_R_RenderScene(pubprogfuncs_t *prinst, struct globalvars
 	else
 		scissored = false;
 
-	R_DrawNameTags();
-#ifdef RTLIGHTS
-	R_EditLights_DrawInfo();
-#endif
-
-	if (r_refdef.drawsbar)
+	if (!vrui.enabled)	//when we're using the vrui, this stuff needs to be part of the scene, drawn seperately for each eye
 	{
-#ifdef PLUGINS
-		Plug_SBar (r_refdef.playerview);
-#else
-		if (Sbar_ShouldDraw(r_refdef.playerview))
-		{
-			SCR_TileClear (sb_lines);
-			Sbar_Draw (r_refdef.playerview);
-			Sbar_DrawScoreboard (r_refdef.playerview);
-		}
-		else
-			SCR_TileClear (0);
+		R_DrawNameTags();
+#ifdef RTLIGHTS
+		R_EditLights_DrawInfo();
 #endif
 
-		if (!Key_Dest_Has(kdm_menu|kdm_cwindows))
+		if (r_refdef.drawsbar)
 		{
-			if (cl.intermissionmode == IM_NQFINALE || cl.intermissionmode == IM_NQCUTSCENE || cl.intermissionmode == IM_H2FINALE)
+#ifdef PLUGINS
+			Plug_SBar (r_refdef.playerview);
+#else
+			if (Sbar_ShouldDraw(r_refdef.playerview))
 			{
-				SCR_CheckDrawCenterString ();
+				SCR_TileClear (sb_lines);
+				Sbar_Draw (r_refdef.playerview);
+				Sbar_DrawScoreboard (r_refdef.playerview);
 			}
-			else if (cl.intermissionmode != IM_NONE)
+			else
+				SCR_TileClear (0);
+#endif
+
+			if (!Key_Dest_Has(kdm_menu|kdm_cwindows))
 			{
-				Sbar_IntermissionOverlay (r_refdef.playerview);
+				if (cl.intermissionmode == IM_NQFINALE || cl.intermissionmode == IM_NQCUTSCENE || cl.intermissionmode == IM_H2FINALE)
+				{
+					SCR_CheckDrawCenterString ();
+				}
+				else if (cl.intermissionmode != IM_NONE)
+				{
+					Sbar_IntermissionOverlay (r_refdef.playerview);
+				}
 			}
+
+			SCR_ShowPics_Draw();
 		}
 
-		SCR_ShowPics_Draw();
+		if (r_refdef.drawcrosshair)
+			R2D_DrawCrosshair();
 	}
 
-	if (r_refdef.drawcrosshair)
-		R2D_DrawCrosshair();
-
 	if (scissored)
 	{
 		if (R2D_Flush)
@@ -3100,7 +3105,7 @@ static model_t *csqc_setmodel(pubprogfuncs_t *prinst, csqcedict_t *ent, int mode
 	}
 	else
 	{
-		if (modelindex >= MAX_PRECACHE_MODELS)
+		if (modelindex >= MAX_PRECACHE_MODELS || !cl.model_name[modelindex])
 			return NULL;
 		prinst->SetStringField(prinst, (void*)ent, &ent->v->model, cl.model_name[modelindex], true);
 		model = cl.model_precache[modelindex];
@@ -3180,7 +3185,7 @@ static int PF_cs_PrecacheModel_Internal(pubprogfuncs_t *prinst, const char *mode
 
 	for (i = 1; i < MAX_PRECACHE_MODELS; i++)	//Make sure that the server specified model is loaded..
 	{
-		if (!*cl.model_name[i])
+		if (!cl.model_name[i])
 			break;
 		if (!strcmp(cl.model_name[i], modelname))
 		{
@@ -3231,7 +3236,7 @@ static void QCBUILTIN PF_cs_getsoundindex (pubprogfuncs_t *prinst, struct global
 	//look for the server's names first...
 	for (i = 1; i < MAX_PRECACHE_SOUNDS; i++)
 	{
-		if (!*cl.sound_name[i])
+		if (!cl.sound_name[i])
 			break;
 		if (!strcmp(cl.sound_name[i], s))
 		{
@@ -3265,7 +3270,7 @@ static void QCBUILTIN PF_cs_ModelnameForIndex(pubprogfuncs_t *prinst, struct glo
 
 	if (modelindex < 0 && (-modelindex) < MAX_CSMODELS)
 		G_INT(OFS_RETURN) = (int)PR_SetString(prinst, cl.model_csqcname[-modelindex]);
-	else if (modelindex >= 0 && modelindex < MAX_PRECACHE_MODELS)
+	else if (modelindex >= 0 && modelindex < MAX_PRECACHE_MODELS && cl.model_name[modelindex])
 		G_INT(OFS_RETURN) = (int)PR_SetString(prinst, cl.model_name[modelindex]);
 	else
 		G_INT(OFS_RETURN) = 0;
@@ -3275,7 +3280,7 @@ static void QCBUILTIN PF_cs_SoundnameForIndex(pubprogfuncs_t *prinst, struct glo
 	int soundindex = G_FLOAT(OFS_PARM0);
 
 	//FIXME: no private indexes. still useful for sending sound names from the ssqc via indexes.
-	if (soundindex >= 0 && soundindex < MAX_PRECACHE_SOUNDS)
+	if (soundindex >= 0 && soundindex < MAX_PRECACHE_SOUNDS && cl.sound_name[soundindex])
 		G_INT(OFS_RETURN) = (int)PR_SetString(prinst, cl.sound_name[soundindex]);
 	else
 		G_INT(OFS_RETURN) = 0;
@@ -5616,6 +5621,8 @@ static void QCBUILTIN PF_cs_registercommand (pubprogfuncs_t *prinst, struct glob
 {
 	const char *str = PR_GetStringOfs(prinst, OFS_PARM0);
 	const char *desc = (prinst->callargc>1)?PR_GetStringOfs(prinst, OFS_PARM1):NULL;
+	if (desc && !*desc)
+		desc = NULL;
 	if (!Cmd_Exists(str))
 		Cmd_AddCommandD(str, CS_ConsoleCommand_f, desc);
 }
@@ -6026,7 +6033,7 @@ static void QCBUILTIN PF_DeltaListen(pubprogfuncs_t *prinst, struct globalvars_s
 	{
 		for (i = 1; i < MAX_PRECACHE_MODELS; i++)
 		{
-			if (!*cl.model_name[i])
+			if (!cl.model_name[i])
 				break;
 			if (!strcmp(cl.model_name[i], mname))
 			{
@@ -6648,13 +6655,13 @@ static void QCBUILTIN PF_resourcestatus(pubprogfuncs_t *prinst, struct globalvar
 		if (idx < 0)
 		{
 			mod = cl.model_csqcprecache[-idx];
-			if (!cl.model_csqcprecache[-idx] && doload)
+			if (!cl.model_csqcprecache[-idx] && doload && cl.model_csqcname[-idx])
 				mod = cl.model_csqcprecache[-idx] = Mod_ForName(Mod_FixName(cl.model_csqcname[-idx], cl.model_name[1]), MLV_WARN);
 		}
 		else if (idx > 0)
 		{
 			mod = cl.model_precache[idx];
-			if (!cl.model_precache[idx] && doload)
+			if (!cl.model_precache[idx] && doload && cl.model_name[idx])
 				mod = cl.model_precache[idx] = Mod_ForName(Mod_FixName(cl.model_name[idx], cl.model_name[1]), MLV_WARN);
 		}
 		else
@@ -7119,8 +7126,8 @@ static struct {
 	{"processmodelevents",		PF_processmodelevents,	0},
 	{"getnextmodelevent",		PF_getnextmodelevent,	0},
 	{"getmodeleventidx",		PF_getmodeleventidx,	0},
-	{"getlocationname",			PF_getlocationname,		0},
 
+	{"getlocationname",			PF_getlocationname,		0},
 	{"crossproduct",			PF_crossproduct,		0},
 	{"pushmove", 				PF_pushmove, 			0},
 #ifdef TERRAIN
@@ -7312,6 +7319,7 @@ static struct {
 
 	{"memalloc",				PF_memalloc,				384},
 	{"memfree",					PF_memfree,					385},
+	{"memcmp",					PF_memcmp,					0},
 	{"memcpy",					PF_memcpy,					386},
 	{"memfill8",				PF_memfill8,				387},
 	{"memgetval",				PF_memgetval,				388},
@@ -7854,6 +7862,24 @@ static void QDECL CSQC_World_GetFrameState(world_t *w, wedict_t *win, framestate
 	cs_getframestate(in, in->xv->renderflags, out);
 }
 
+static qboolean CSQC_GenerateMaterial(struct shaderparsestate_s *ps, const char *materialname, void (*LoadMaterialString)(struct shaderparsestate_s *ps, const char *script))
+{
+	COM_AssertMainThread("CSQC_GenerateMaterial");
+	if (csqcg.CSQC_GenerateMaterial)
+	{
+		void *pr_globals = PR_globals(csqcprogs, PR_CURRENT);
+		(((string_t *)pr_globals)[OFS_PARM0] = PR_TempString(csqcprogs, materialname));
+		PR_ExecuteProgram(csqcprogs, csqcg.CSQC_GenerateMaterial);
+		if (G_INT(OFS_RETURN))
+		{	//we got the script, now pass it to our material system to parse it.
+			LoadMaterialString(ps, PR_GetStringOfs(csqcprogs, OFS_RETURN));
+			return true;
+		}
+	}
+	return false;
+}
+static plugmaterialloaderfuncs_t csqcmaterialloader = {"csqc", CSQC_GenerateMaterial};
+
 void CSQC_Shutdown(void)
 {
 	int i;
@@ -7862,6 +7888,8 @@ void CSQC_Shutdown(void)
 		if (csqcg.CSQC_Shutdown)
 			PR_ExecuteProgram(csqcprogs, csqcg.CSQC_Shutdown);
 
+		Material_RegisterLoader(&csqc_world, NULL);
+
 		key_dest_absolutemouse &= ~kdm_game;
 		CSQC_ForgetThreads();
 		PR_ReleaseFonts(kdm_game);
@@ -7949,11 +7977,11 @@ static void *CSQC_FindMainProgs(size_t *sz, const char *name, unsigned int check
 
 	if (!file)
 	{
-		const char *progsname = InfoBuf_ValueForKey(&cl.serverinfo, "*csprogsname");
+		const char *progsname = cls.state?InfoBuf_ValueForKey(&cl.serverinfo, "*csprogsname"):"csprogs.dat";
 		flocation_t loc={0};
 		vfsfile_t *f;
 		qboolean found = false;
-		if (!found && *progsname && cls.state)
+		if (!found && *progsname)
 			found = FS_FLocateFile(progsname, FSLF_IGNOREPURE, &loc);
 		if (!found && strcmp(progsname, "csprogs.dat"))
 		{
@@ -7972,7 +8000,11 @@ static void *CSQC_FindMainProgs(size_t *sz, const char *name, unsigned int check
 				if (checksum && !csprogs_promiscuous)
 				{
 					if (!CSQC_ValidateMainCSProgs(file, *sz, checksum, checksize))
-						file = NULL;
+					{	//its not a match... maybe we can get a better one from the pure paths instead...
+						file = COM_LoadTempFile (progsname, 0, sz);
+						if (!CSQC_ValidateMainCSProgs(file, *sz, checksum, checksize))
+							file = NULL;
+					}
 
 					//we write the csprogs into our archive if it was loaded from outside of there.
 					//this is to ensure that demos will play on the same machine later on...
@@ -8429,6 +8461,9 @@ qboolean CSQC_Init (qboolean anycsqc, const char *csprogsname, unsigned int chec
 
 		csqcentsize = PR_InitEnts(csqcprogs, pr_csqc_maxedicts.value);
 
+		if (csqcg.CSQC_GenerateMaterial)
+			Material_RegisterLoader(&csqc_world, &csqcmaterialloader);
+
 		//world edict becomes readonly
 		worldent = (csqcedict_t *)EDICT_NUM_PB(csqcprogs, 0);
 		worldent->ereftype = ER_ENTITY;
@@ -8455,7 +8490,7 @@ qboolean CSQC_Init (qboolean anycsqc, const char *csprogsname, unsigned int chec
 			char *s = InfoBuf_ValueForKey(&cl.serverinfo, "map");
 			if (!*s)
 				s = cl.model_name[1];
-			if (!*s)
+			if (!s || !*s)
 				s = "unknown";
 			*str = PR_NewString(csqcprogs, s);
 		}
diff --git a/engine/client/pr_menu.c b/engine/client/pr_menu.c
index 1e58159cb..4a8826ad9 100644
--- a/engine/client/pr_menu.c
+++ b/engine/client/pr_menu.c
@@ -1351,6 +1351,7 @@ static struct
 {
 	evalc_t chain;
 	evalc_t model;
+	evalc_t modelindex;
 	evalc_t mins;
 	evalc_t maxs;
 	evalc_t origin;
@@ -1364,6 +1365,7 @@ static struct
 	evalc_t frame2time;
 	evalc_t renderflags;
 	evalc_t skinobject;
+	evalc_t skelobject;
 	evalc_t colourmod;
 	evalc_t alpha;
 } menuc_eval;
@@ -2034,6 +2036,23 @@ static void QCBUILTIN PF_m_precache_model(pubprogfuncs_t *prinst, struct globalv
 	const char *modelname = PR_GetStringOfs(prinst, OFS_PARM0);
 	Mod_ForName(modelname, MLV_WARN);
 }
+static model_t *QDECL MP_GetCModel(struct world_s *w, int modelindex)
+{
+	extern int		mod_numknown;
+	modelindex--;
+	if (modelindex < 0 || modelindex >= mod_numknown)
+		return NULL;
+	return &mod_known[modelindex];
+}
+static void QCBUILTIN PF_m_getmodelindex(pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
+{
+	const char *modelname = PR_GetStringOfs(prinst, OFS_PARM0);
+	model_t *m = Mod_ForName(modelname, MLV_WARN);
+	if (m)
+		G_FLOAT(OFS_RETURN) = (m-mod_known)+1;
+	else
+		G_FLOAT(OFS_RETURN) = 0;
+}
 static void QCBUILTIN PF_m_setmodel(pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
 {
 	menuedict_t *ent = (void*)G_EDICT(prinst, OFS_PARM0);
@@ -2041,6 +2060,7 @@ static void QCBUILTIN PF_m_setmodel(pubprogfuncs_t *prinst, struct globalvars_s
 	eval_t *modelval = prinst->GetEdictFieldValue(prinst, (void*)ent, "model", ev_string, &menuc_eval.model);
 	eval_t *minsval = prinst->GetEdictFieldValue(prinst, (void*)ent, "mins", ev_vector, &menuc_eval.mins);
 	eval_t *maxsval = prinst->GetEdictFieldValue(prinst, (void*)ent, "maxs", ev_vector, &menuc_eval.maxs);
+	eval_t *modelidxval = prinst->GetEdictFieldValue(prinst, (void*)ent, "modelindex", ev_float, &menuc_eval.modelindex);
 	model_t *mod = Mod_ForName(modelname, MLV_WARN);
 	if (modelval)
 		modelval->string = G_INT(OFS_PARM1);	//lets hope garbage collection is enough.
@@ -2050,6 +2070,8 @@ static void QCBUILTIN PF_m_setmodel(pubprogfuncs_t *prinst, struct globalvars_s
 	if (mod)
 		while(mod->loadstate == MLS_LOADING)
 			COM_WorkerPartialSync(mod, &mod->loadstate, MLS_LOADING);
+	if (modelidxval)
+		modelidxval->_float = mod?(mod-mod_known)+1:0;
 
 	if (mod && minsval)
 		VectorCopy(mod->mins, minsval->_vector);
@@ -2110,6 +2132,44 @@ static void QCBUILTIN PF_m_clearscene(pubprogfuncs_t *prinst, struct globalvars_
 	V_CalcRefdef(&menuview);	//set up the defaults
 	r_refdef.flags |= RDF_NOWORLDMODEL;
 }
+static void QDECL MP_Read_FrameState(pubprogfuncs_t *prinst, wedict_t *ent, framestate_t *fstate)
+{
+	eval_t *frame1val = prinst->GetEdictFieldValue(prinst, (void*)ent, "frame", ev_float, &menuc_eval.frame1);
+	eval_t *frame2val = prinst->GetEdictFieldValue(prinst, (void*)ent, "frame2", ev_float, &menuc_eval.frame2);
+	eval_t *lerpfracval = prinst->GetEdictFieldValue(prinst, (void*)ent, "lerpfrac", ev_float, &menuc_eval.lerpfrac);
+	eval_t *frame1timeval = prinst->GetEdictFieldValue(prinst, (void*)ent, "frame1time", ev_float, &menuc_eval.frame1time);
+	eval_t *frame2timeval = prinst->GetEdictFieldValue(prinst, (void*)ent, "frame2time", ev_float, &menuc_eval.frame2time);
+	eval_t *skelobjectval = prinst->GetEdictFieldValue(prinst, (void*)ent, "skeletonindex", ev_float, &menuc_eval.skelobject);
+
+	fstate->g[FST_BASE].endbone = 0;
+	fstate->g[FS_REG].endbone = 0x7fffffff;
+	fstate->g[FS_REG].frame[0] = frame1val?frame1val->_float:0;
+	fstate->g[FS_REG].frame[1] = frame2val?frame2val->_float:0;
+	fstate->g[FS_REG].lerpweight[1] = lerpfracval?lerpfracval->_float:0;
+	fstate->g[FS_REG].frametime[0] = frame1timeval?frame1timeval->_float:0;
+	fstate->g[FS_REG].frametime[1] = frame2timeval?frame2timeval->_float:0;
+
+#if FRAME_BLENDS >= 4
+	fstate->g[FS_REG].frame[2] = fstate->g[FS_REG].frame[0];
+	fstate->g[FS_REG].lerpweight[2] = 0;
+	fstate->g[FS_REG].frame[3] = fstate->g[FS_REG].frame[0];
+	fstate->g[FS_REG].lerpweight[3] = 0;
+	fstate->g[FS_REG].lerpweight[0] = 1-(fstate->g[FS_REG].lerpweight[1]+fstate->g[FS_REG].lerpweight[2]+fstate->g[FS_REG].lerpweight[3]);
+#else
+	fstate->g[FS_REG].lerpweight[0] = 1-fstate->g[FS_REG].lerpweight[1];
+#endif
+
+#if defined(SKELETALOBJECTS) || defined(RAGDOLL)
+	fstate->bonecount = 0;
+	fstate->bonestate = NULL;
+	if (skelobjectval && skelobjectval->_float)
+		skel_lookup(&menu_world, skelobjectval->_float, fstate);
+#endif
+}
+static void QDECL MP_Get_FrameState(struct world_s *w, wedict_t *ent, framestate_t *fstate)
+{
+	MP_Read_FrameState(w->progs, ent, fstate);
+}
 static qboolean CopyMenuEdictToEntity(pubprogfuncs_t *prinst, menuedict_t *in, entity_t *out)
 {
 	eval_t *modelval = prinst->GetEdictFieldValue(prinst, (void*)in, "model", ev_string, &menuc_eval.model);
@@ -2121,6 +2181,7 @@ static qboolean CopyMenuEdictToEntity(pubprogfuncs_t *prinst, menuedict_t *in, e
 	eval_t *lerpfracval = prinst->GetEdictFieldValue(prinst, (void*)in, "lerpfrac", ev_float, &menuc_eval.lerpfrac);
 	eval_t *frame1timeval = prinst->GetEdictFieldValue(prinst, (void*)in, "frame1time", ev_float, &menuc_eval.frame1time);
 	eval_t *frame2timeval = prinst->GetEdictFieldValue(prinst, (void*)in, "frame2time", ev_float, &menuc_eval.frame2time);
+	eval_t *skelobjectval = prinst->GetEdictFieldValue(prinst, (void*)in, "skeletonindex", ev_float, &menuc_eval.skelobject);
 	eval_t *colormapval = prinst->GetEdictFieldValue(prinst, (void*)in, "colormap", ev_float, &menuc_eval.colormap);
 	eval_t *renderflagsval = prinst->GetEdictFieldValue(prinst, (void*)in, "renderflags", ev_float, &menuc_eval.renderflags);
 	eval_t *skinobjectval = prinst->GetEdictFieldValue(prinst, (void*)in, "skinobject", ev_float, &menuc_eval.skinobject);
@@ -2149,6 +2210,13 @@ static qboolean CopyMenuEdictToEntity(pubprogfuncs_t *prinst, menuedict_t *in, e
 	out->framestate.g[FS_REG].frametime[0] = frame1timeval?frame1timeval->_float:0;
 	out->framestate.g[FS_REG].frametime[1] = frame2timeval?frame2timeval->_float:0;
 
+#if defined(SKELETALOBJECTS) || defined(RAGDOLL)
+	out->framestate.bonecount = 0;
+	out->framestate.bonestate = NULL;
+	if (skelobjectval && skelobjectval->_float)
+		skel_lookup(&menu_world, skelobjectval->_float, &out->framestate);
+#endif
+
 	out->customskin = skinobjectval?skinobjectval->_float:0;
 
 	//FIXME: colourmap
@@ -2285,6 +2353,8 @@ static void QCBUILTIN PF_menu_registercommand (pubprogfuncs_t *prinst, struct gl
 {
 	const char *str = PR_GetStringOfs(prinst, OFS_PARM0);
 	const char *desc = (prinst->callargc>1)?PR_GetStringOfs(prinst, OFS_PARM1):NULL;
+	if (desc && !*desc)
+		desc = NULL;
 	if (!Cmd_Exists(str))
 		Cmd_AddCommandD(str, MP_ConsoleCommand_f, desc);
 }
@@ -2466,6 +2536,8 @@ static struct {
 	{"precache_model",			PF_m_precache_model,		91},
 	{"setorigin",				PF_m_setorigin,				92},
 															//gap
+	{"getmodelindex",			PF_m_getmodelindex,			200},
+															//gap
 	{"abort",					PF_Abort,					211},
 															//gap
 	{"strstrofs",				PF_strstrofs,				221},
@@ -2484,6 +2556,29 @@ static struct {
 	{"shaderforname",			PF_shaderforname,			238},
 	{"sendpacket",				PF_cl_SendPacket,			242},
 															//gap
+	{"skel_create",				PF_skel_create,				263},//float(float modlindex) skel_create = #263; // (FTE_CSQC_SKELETONOBJECTS)
+	{"skel_build",				PF_skel_build,				264},//float(float skel, entity ent, float modelindex, float retainfrac, float firstbone, float lastbone, optional float addition) skel_build = #264; // (FTE_CSQC_SKELETONOBJECTS)
+	{"skel_build_ptr",			PF_skel_build_ptr,			0},//float(float skel, int numblends, __variant *blends, int blendsize) skel_build_ptr = #0;
+	{"skel_get_numbones",		PF_skel_get_numbones,		265},//float(float skel) skel_get_numbones = #265; // (FTE_CSQC_SKELETONOBJECTS)
+	{"skel_get_bonename",		PF_skel_get_bonename,		266},//string(float skel, float bonenum) skel_get_bonename = #266; // (FTE_CSQC_SKELETONOBJECTS) (returns tempstring)
+	{"skel_get_boneparent",		PF_skel_get_boneparent,		267},//float(float skel, float bonenum) skel_get_boneparent = #267; // (FTE_CSQC_SKELETONOBJECTS)
+	{"skel_find_bone",			PF_skel_find_bone,			268},//float(float skel, string tagname) skel_get_boneidx = #268; // (FTE_CSQC_SKELETONOBJECTS)
+	{"skel_get_bonerel",		PF_skel_get_bonerel,		269},//vector(float skel, float bonenum) skel_get_bonerel = #269; // (FTE_CSQC_SKELETONOBJECTS) (sets v_forward etc)
+	{"skel_get_boneabs",		PF_skel_get_boneabs,		270},//vector(float skel, float bonenum) skel_get_boneabs = #270; // (FTE_CSQC_SKELETONOBJECTS) (sets v_forward etc)
+	{"skel_set_bone",			PF_skel_set_bone,			271},//void(float skel, float bonenum, vector org) skel_set_bone = #271; // (FTE_CSQC_SKELETONOBJECTS) (reads v_forward etc)
+	{"skel_premul_bone",		PF_skel_premul_bone,		272},//void(float skel, float bonenum, vector org) skel_mul_bone = #272; // (FTE_CSQC_SKELETONOBJECTS) (reads v_forward etc)
+	{"skel_premul_bones",		PF_skel_premul_bones,		273},//void(float skel, float startbone, float endbone, vector org) skel_mul_bone = #273; // (FTE_CSQC_SKELETONOBJECTS) (reads v_forward etc)
+	{"skel_postmul_bone",		PF_skel_postmul_bone,		0},//void(float skel, float bonenum, vector org) skel_mul_bone = #272; // (FTE_CSQC_SKELETONOBJECTS) (reads v_forward etc)
+//	{"skel_postmul_bones",		PF_skel_postmul_bones,		0},//void(float skel, float startbone, float endbone, vector org) skel_mul_bone = #273; // (FTE_CSQC_SKELETONOBJECTS) (reads v_forward etc)
+	{"skel_copybones",			PF_skel_copybones,			274},//void(float skeldst, float skelsrc, float startbone, float entbone) skel_copybones = #274; // (FTE_CSQC_SKELETONOBJECTS)
+	{"skel_delete",				PF_skel_delete,				275},//void(float skel) skel_delete = #275; // (FTE_CSQC_SKELETONOBJECTS)
+	{"frameforname",			PF_frameforname,			276},//float(float modidx, string framename) frameforname = #276 (FTE_CSQC_SKELETONOBJECTS)
+	{"frameduration",			PF_frameduration,			277},//float(float modidx, float framenum) frameduration = #277 (FTE_CSQC_SKELETONOBJECTS)
+	{"frameforaction",			PF_frameforaction,			0},//float(float modidx, int actionid) frameforaction = #0
+	{"processmodelevents",		PF_processmodelevents,		0},
+	{"getnextmodelevent",		PF_getnextmodelevent,		0},
+	{"getmodeleventidx",		PF_getmodeleventidx,		0},
+															//gap
 	{"hash_createtab",			PF_hash_createtab,			287},
 	{"hash_destroytab",			PF_hash_destroytab,			288},
 	{"hash_add",				PF_hash_add,				289},
@@ -2555,6 +2650,7 @@ static struct {
 															//gap
 	{"memalloc",				PF_memalloc,				384},
 	{"memfree",					PF_memfree,					385},
+	{"memcmp",					PF_memcmp,					0},
 	{"memcpy",					PF_memcpy,					386},
 	{"memfill8",				PF_memfill8,				387},
 	{"memgetval",				PF_memgetval,				388},
@@ -3163,8 +3259,12 @@ qboolean MP_Init (void)
 	menutime = Sys_DoubleTime();
 	if (!menu_world.progs)
 	{
+		vec3_t fwd,rht,up;
 		int mprogs;
 		Con_DPrintf("Initializing menu.dat\n");
+		menu_world.Get_CModel = MP_GetCModel;
+		menu_world.Get_FrameState = MP_Get_FrameState;
+
 		menu_world.progs = InitProgs(&menuprogparms);
 		PR_Configure(menu_world.progs, PR_ReadBytesString(pr_menu_memsize.string), 1, pr_enable_profiling.ival);
 		mprogs = PR_LoadProgs(menu_world.progs, "menu.dat");
@@ -3193,6 +3293,10 @@ qboolean MP_Init (void)
 			*menu_world.g.time = Sys_DoubleTime();
 		menu_world.g.frametime = (float*)PR_FindGlobal(menu_world.progs, "frametime", 0, NULL);
 
+		menu_world.g.v_forward	= (float*)PR_FindGlobal(menu_world.progs, "v_forward",	0, NULL); if (!menu_world.g.v_forward)	menu_world.g.v_forward = fwd;
+		menu_world.g.v_right	= (float*)PR_FindGlobal(menu_world.progs, "v_right",	0, NULL); if (!menu_world.g.v_right)	menu_world.g.v_right = rht;
+		menu_world.g.v_up		= (float*)PR_FindGlobal(menu_world.progs, "v_up",		0, NULL); if (!menu_world.g.v_up)		menu_world.g.v_up = up;
+
 		menu_world.g.drawfont = (float*)PR_FindGlobal(menu_world.progs, "drawfont", 0, NULL);
 		menu_world.g.drawfontscale = (float*)PR_FindGlobal(menu_world.progs, "drawfontscale", 0, NULL);
 
diff --git a/engine/client/pr_skelobj.c b/engine/client/pr_skelobj.c
index 5d6ac9d04..c446902a8 100644
--- a/engine/client/pr_skelobj.c
+++ b/engine/client/pr_skelobj.c
@@ -1625,7 +1625,7 @@ void rag_updatedeltaent(world_t *w, entity_t *ent, lerpents_t *le)
 			sko->numanimated = 0;
 		else if (sko->doll)
 			sko->numanimated = sko->doll->numdefaultanimated;
-		Mod_GetBoneRelations(mod, 0, skorel.numbones, &ent->framestate, skorel.bonematrix);
+		Mod_GetBoneRelations(mod, 0, skorel.numbones, NULL, &ent->framestate, skorel.bonematrix);
 		skorel.modelindex = sko->modelindex;
 		skorel.model = sko->model;
 		if (sko->numanimated || sko->doll != mod->dollinfo)
@@ -1932,6 +1932,7 @@ void QCBUILTIN PF_skel_build(pubprogfuncs_t *prinst, struct globalvars_s *pr_glo
 	framestate_t fstate;
 	skelobject_t *skelobj;
 	model_t *model;
+	galiasbone_t *boneinfo;
 
 	//default to failure
 	G_FLOAT(OFS_RETURN) = 0;
@@ -1946,19 +1947,27 @@ void QCBUILTIN PF_skel_build(pubprogfuncs_t *prinst, struct globalvars_s *pr_glo
 	fstate.bonecount = 0;
 	fstate.bonestate = NULL;
 
-	numbones = Mod_GetNumBones(model, false);
-	if (!numbones)
-	{
-		return;	//this isn't a skeletal model.
-	}
-
 	if (!skelidx)
+	{
+		numbones = Mod_GetNumBones(model, false);
+		if (!numbones)
+		{
+			return;	//this isn't a skeletal model.
+		}
 		skelobj = skel_create(w, numbones);
+	}
 	else
 		skelobj = skel_get(w, skelidx);
 	if (!skelobj)
 		return;	//couldn't get one, ran out of memory or something?
 
+	if (skelobj->model)
+		boneinfo = Mod_GetBoneInfo(skelobj->model, &numbones);
+	else
+		boneinfo = NULL;
+	numbones = skelobj->numbones;
+
+
 	if (lastbone < 0)
 		lastbone = numbones;
 	if (lastbone > numbones)
@@ -1980,15 +1989,15 @@ void QCBUILTIN PF_skel_build(pubprogfuncs_t *prinst, struct globalvars_s *pr_glo
 
 	if (retainfrac == 0)
 	{
-		if (addition == 1) /*replace everything*/
-			Mod_GetBoneRelations(model, firstbone, lastbone, &fstate, skelobj->bonematrix);
-		else if (addition == 0) /*wipe it*/
+		if (addition == 0) /*wipe it*/
 			memset(skelobj->bonematrix + firstbone*12, 0, sizeof(float)*12*(lastbone-firstbone));
+		else if (addition == 1) /*replace everything*/
+			Mod_GetBoneRelations(model, firstbone, lastbone, boneinfo, &fstate, skelobj->bonematrix);
 		else
 		{
 			//scale new
 			float relationsbuf[MAX_BONES*12];
-			Mod_GetBoneRelations(model, firstbone, lastbone, &fstate, relationsbuf);
+			Mod_GetBoneRelations(model, firstbone, lastbone, boneinfo, &fstate, relationsbuf);
 			for (i = firstbone; i < lastbone; i++)
 			{
 				for (j = 0; j < 12; j++)
@@ -1998,6 +2007,8 @@ void QCBUILTIN PF_skel_build(pubprogfuncs_t *prinst, struct globalvars_s *pr_glo
 	}
 	else
 	{
+		float relationsbuf[MAX_BONES*12];
+
 		if (retainfrac != 1)
 		{
 			//rescale the existing bones
@@ -2007,22 +2018,19 @@ void QCBUILTIN PF_skel_build(pubprogfuncs_t *prinst, struct globalvars_s *pr_glo
 					skelobj->bonematrix[i*12+j] *= retainfrac;
 			}
 		}
+
+		//just add
+		Mod_GetBoneRelations(model, firstbone, lastbone, boneinfo, &fstate, relationsbuf);
 		if (addition == 1)
 		{
-			//just add
-			float relationsbuf[MAX_BONES*12];
-			Mod_GetBoneRelations(model, firstbone, lastbone, &fstate, relationsbuf);
 			for (i = firstbone; i < lastbone; i++)
 			{
 				for (j = 0; j < 12; j++)
 					skelobj->bonematrix[i*12+j] += relationsbuf[i*12+j];
 			}
 		}
-		else if (addition)
+		else
 		{
-			//add+scale
-			float relationsbuf[MAX_BONES*12];
-			Mod_GetBoneRelations(model, firstbone, lastbone, &fstate, relationsbuf);
 			for (i = firstbone; i < lastbone; i++)
 			{
 				for (j = 0; j < 12; j++)
@@ -2068,6 +2076,7 @@ void QCBUILTIN PF_skel_build_ptr(pubprogfuncs_t *prinst, struct globalvars_s *pr
 	int numbones, firstbone, lastbone;
 	model_t *model;
 	qboolean noadd;
+	const galiasbone_t *boneinfo = NULL;
 
 	//default to failure
 	G_FLOAT(OFS_RETURN) = 0;
@@ -2170,7 +2179,7 @@ void QCBUILTIN PF_skel_build_ptr(pubprogfuncs_t *prinst, struct globalvars_s *pr
 			}
 		}
 		else if (blends->prescale == 0) //new data only. directly replace the existing data
-			Mod_GetBoneRelations(model, firstbone, lastbone, &fstate, skelobj->bonematrix);
+			Mod_GetBoneRelations(model, firstbone, lastbone, boneinfo, &fstate, skelobj->bonematrix);
 		else
 		{
 			if (blends->prescale != 1)
@@ -2183,7 +2192,7 @@ void QCBUILTIN PF_skel_build_ptr(pubprogfuncs_t *prinst, struct globalvars_s *pr
 				}
 			}
 
-			Mod_GetBoneRelations(model, firstbone, lastbone, &fstate, relationsbuf);
+			Mod_GetBoneRelations(model, firstbone, lastbone, boneinfo, &fstate, relationsbuf);
 			for (i = firstbone; i < lastbone; i++)
 			{
 				for (j = 0; j < 12; j++)
@@ -2671,10 +2680,10 @@ void QCBUILTIN PF_frametoname (pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 {
 	world_t *w = prinst->parms->user;
 	int modelindex = G_FLOAT(OFS_PARM0);
-	unsigned int skinnum = G_FLOAT(OFS_PARM1);
+	unsigned int animnum = G_FLOAT(OFS_PARM1);
 	int surfaceidx = 0;
 	model_t *mod = w->Get_CModel(w, modelindex);
-	const char *n = Mod_FrameNameForNum(mod, surfaceidx, skinnum);
+	const char *n = Mod_FrameNameForNum(mod, surfaceidx, animnum);
 
 	if (n)
 		RETURN_TSTRING(n);
diff --git a/engine/client/quakedef.h b/engine/client/quakedef.h
index 50feb7b03..91f02f550 100644
--- a/engine/client/quakedef.h
+++ b/engine/client/quakedef.h
@@ -208,7 +208,7 @@ extern "C" {
 #endif
 
 #if defined(Q3CLIENT) || defined(Q3SERVER)
-#include "q3api.h"
+#include "../common/q3api.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/engine/client/r_surf.c b/engine/client/r_surf.c
index 788017f00..c3f8c8b1b 100644
--- a/engine/client/r_surf.c
+++ b/engine/client/r_surf.c
@@ -876,7 +876,7 @@ static void Surf_StoreLightmap_RGB(qbyte *dest, unsigned int *bl, int smax, int
 	switch(lm->fmt)
 	{
 	default:
-		Sys_Error("Bad lightmap_fmt\n");
+		Sys_Error("Surf_StoreLightmap_RGB: Bad format - %s\n", Image_FormatName(lm->fmt));
 		break;
 	case PTI_A2BGR10:
 		stride = (lm->width-smax)<<2;
@@ -1492,7 +1492,7 @@ static void Surf_BuildLightMap (model_t *model, msurface_t *surf, int map, int s
 // add all the lightmaps
 			if (src)
 			{
-				if (model->fromgame == fg_quake3)
+				if (model->lightmaps.prebaked)
 					Sys_Error("Surf_BuildLightMap: q3bsp");
 				switch(model->lightmaps.fmt)
 				{
@@ -1773,7 +1773,7 @@ static void Surf_BuildLightMap_Worker (model_t *wmodel, msurface_t *surf, int sh
 // add all the lightmaps
 			if (src)
 			{
-				if (wmodel->fromgame == fg_quake3)	//rgb
+				if (wmodel->lightmaps.prebaked)	//rgb
 				{
 					/*q3 lightmaps are meant to be pre-built
 					this code is misguided, and ought never be executed anyway.
@@ -1790,6 +1790,7 @@ static void Surf_BuildLightMap_Worker (model_t *wmodel, msurface_t *surf, int sh
 							bl+=3;
 						}
 					}
+					Sys_Error("Surf_BuildLightMap_Worker: q3bsp");
 				}
 				else switch(wmodel->lightmaps.fmt)
 				{
@@ -2055,7 +2056,11 @@ dynamic:
 
 #ifdef _DEBUG
 	if ((unsigned)fa->lightmaptexturenums[0] >= numlightmaps)
-		Sys_Error("Invalid lightmap index\n");
+	{
+		static float throttle;
+		Con_ThrottlePrintf(&throttle, 0, CON_WARNING"Invalid lightmap index\n");
+		return;
+	}
 #endif
 
 
@@ -2303,7 +2308,7 @@ void Surf_GenBrushBatches(batch_t **batches, entity_t *ent)
 
 // calculate dynamic lighting for bmodel if it's not an
 // instanced model
-	if (model->fromgame != fg_quake3 && model->fromgame != fg_doom3 && lightmap && !(webo_blocklightmapupdates&1))
+	if (!model->lightmaps.prebaked && lightmap && !(webo_blocklightmapupdates&1))
 	{
 		int k;
 
@@ -3094,7 +3099,7 @@ void Surf_DrawWorld (void)
 						gennew = true;	//generate an initial one, if we can.
 					else
 					{
-						if (!gennew && currentmodel->fromgame != fg_quake3)
+						if (!gennew && !currentmodel->lightmaps.prebaked)
 						{
 							int i = cl_max_lightstyles;
 							for (i = 0; i < cl_max_lightstyles; i++)
@@ -3449,6 +3454,8 @@ uploadfmt_t Surf_NameToFormat(const char *nam)
 uploadfmt_t Surf_LightmapMode(model_t *model)
 {
 	uploadfmt_t fmt = Surf_NameToFormat(r_lightmap_format.string);
+	if (model && model->lightmaps.prebaked && model->lightmaps.fmt!=LM_RGB8)
+		fmt = PTI_INVALID;	//don't let them force it away if we can't support it. this sucks.
 	if (!sh_config.texfmt[fmt])
 	{
 		qboolean hdr = (vid.flags&VID_SRGBAWARE), rgb = false;
@@ -3755,7 +3762,7 @@ void Surf_BuildModelLightmaps (model_t *m)
 
 	R_BumpLightstyles(m->lightmaps.maxstyle);	//should only really happen with lazy loading
 
-	if (m->submodelof && m->fromgame == fg_quake3)	//FIXME: should be all bsp formats
+	if (m->submodelof && m->lightmaps.prebaked)	//FIXME: should be all bsp formats
 	{
 		if (m->submodelof->loadstate != MLS_LOADED)
 			return;
@@ -3763,7 +3770,7 @@ void Surf_BuildModelLightmaps (model_t *m)
 	}
 	else
 	{
-		if (!m->lightdata && m->lightmaps.count && m->fromgame == fg_quake3)
+		if (!m->lightdata && m->lightmaps.count && m->lightmaps.prebaked)
 		{
 			char pattern[MAX_QPATH];
 			COM_StripAllExtensions(m->name, pattern, sizeof(pattern));
@@ -3787,7 +3794,7 @@ void Surf_BuildModelLightmaps (model_t *m)
 		}
 	}
 
-	if (m->fromgame == fg_quake3)
+	if (m->lightmaps.prebaked)
 	{
 		int j;
 		unsigned char *src, *stop;
@@ -3817,24 +3824,38 @@ void Surf_BuildModelLightmaps (model_t *m)
 		if (!m->submodelof)
 		for (i = 0; i < m->lightmaps.count; i++)
 		{
-			if (lightmap[newfirst+i]->external)
+			if (lightmap[newfirst+i]->external || !m->lightdata)
 				continue;
 
-			dst = lightmap[newfirst+i]->lightmaps;
-			src = m->lightdata + i*m->lightmaps.width*m->lightmaps.height*3;
-			stop = m->lightdata + (i+1)*m->lightmaps.width*m->lightmaps.height*3;
-			if (stop-m->lightdata > m->lightdatasize)
-				stop = m->lightdata + m->lightdatasize;
-			if (m->lightdata)
+			if (lightmap[newfirst+i]->fmt == m->lightmaps.prebaked)
 			{
+				unsigned int bb,bw,bh,bd;
+				Image_BlockSizeForEncoding(m->lightmaps.prebaked, &bb,&bw,&bh,&bd);
+
+				dst = lightmap[newfirst+i]->lightmaps;
+				src = m->lightdata + i*m->lightmaps.width*m->lightmaps.height*bb;
+				stop = m->lightdata + (i+1)*m->lightmaps.width*m->lightmaps.height*bb;
+				if (stop-m->lightdata > m->lightdatasize)
+					stop = m->lightdata + m->lightdatasize;
+				memcpy(dst, src, stop-src);
+			}
+			//FIXME: replace with Image_ChangeFormat here. but the data may be partial for the last mip.
+			else switch(m->lightmaps.fmt)
+			{
+			case LM_RGB8:
+				dst = lightmap[newfirst+i]->lightmaps;
+				src = m->lightdata + i*m->lightmaps.width*m->lightmaps.height*3;
+				stop = m->lightdata + (i+1)*m->lightmaps.width*m->lightmaps.height*3;
+				if (stop-m->lightdata > m->lightdatasize)
+					stop = m->lightdata + m->lightdatasize;
 				switch(lightmap[newfirst+i]->fmt)
 				{
 				default:
-					Sys_Error("Bad lightmap_fmt\n");
+					Sys_Error("Surf_BuildModelLightmaps: Bad format - %s\n", Image_FormatName(lightmap[newfirst+i]->fmt));
 					break;
 				case PTI_A2BGR10:
 					for (; src < stop; dst += 4, src += 3)
-						*(unsigned int*)dst = (0x3<<30) | (src[2]<<22) | (src[1]<<12) | (src[0]<<2);
+						*(unsigned int*)dst = (0x3u<<30) | (src[2]<<22) | (src[1]<<12) | (src[0]<<2);
 					break;
 				case PTI_E5BGR9:
 					for (; src < stop; dst += 4, src += 3)
@@ -3850,7 +3871,8 @@ void Surf_BuildModelLightmaps (model_t *m)
 						dst[3] = 255;
 					}
 					break;
-				/*case TF_RGBA32:
+				case PTI_RGBA8:
+				case PTI_RGBX8:
 					for (; src < stop; dst += 4, src += 3)
 					{
 						dst[0] = src[0];
@@ -3859,15 +3881,15 @@ void Surf_BuildModelLightmaps (model_t *m)
 						dst[3] = 255;
 					}
 					break;
-				case TF_BGR24:
+				case PTI_BGR8:
 					for (; src < stop; dst += 3, src += 3)
 					{
 						dst[0] = src[2];
 						dst[1] = src[1];
 						dst[2] = src[0];
 					}
-					break;*/
-				case TF_RGB24:
+					break;
+				case PTI_RGB8:
 					for (; src < stop; dst += 3, src += 3)
 					{
 						dst[0] = src[0];
@@ -3886,6 +3908,23 @@ void Surf_BuildModelLightmaps (model_t *m)
 					}
 					break;
 				}
+				break;
+
+			case LM_E5BGR9:
+				dst = lightmap[newfirst+i]->lightmaps;
+				src = m->lightdata + i*m->lightmaps.width*m->lightmaps.height*4;
+				stop = m->lightdata + (i+1)*m->lightmaps.width*m->lightmaps.height*4;
+				if (stop-m->lightdata > m->lightdatasize)
+					stop = m->lightdata + m->lightdatasize;
+
+				if (lightmap[newfirst+i]->fmt == PTI_E5BGR9)
+					memcpy(dst, src, stop-src);
+				else	//this can happen on older gpus...
+					Con_Printf(CON_WARNING"Unsupported lightmap format. set ^[/r_lightmap_format e5bgr9^]\n");
+				break;
+			default:
+				Con_Printf(CON_WARNING"Unsupported input lightmap format\n");
+				break;
 			}
 		}
 	}
@@ -4010,7 +4049,7 @@ void Surf_NewMap (model_t *worldmodel)
 
 	//evil haxx
 	r_dynamic.ival = r_dynamic.value;
-	if (r_dynamic.ival > 0 && (!cl.worldmodel || cl.worldmodel->fromgame == fg_quake3)) //quake3 has no lightmaps, disable r_dynamic
+	if (r_dynamic.ival > 0 && (!cl.worldmodel || cl.worldmodel->lightmaps.prebaked)) //quake3 has no lightmaps, disable r_dynamic
 		r_dynamic.ival = 0;
 
 	memset (&r_worldentity, 0, sizeof(r_worldentity));
diff --git a/engine/client/render.h b/engine/client/render.h
index c2ea71b8d..a81f1b93e 100644
--- a/engine/client/render.h
+++ b/engine/client/render.h
@@ -586,7 +586,7 @@ struct llightinfo_s;
 void LightPlane (struct relight_ctx_s *ctx, struct llightinfo_s *threadctx, lightstyleindex_t surf_styles[MAXCPULIGHTMAPS], unsigned int *surf_expsamples, qbyte *surf_rgbsamples, qbyte *surf_deluxesamples, vec4_t surf_plane, vec4_t surf_texplanes[2], vec2_t exactmins, vec2_t exactmaxs, int texmins[2], int texsize[2], float lmscale);	//special version that doesn't know what a face is or anything.
 struct relight_ctx_s *LightStartup(struct relight_ctx_s *ctx, struct model_s *model, qboolean shadows, qboolean skiplit);
 void LightReloadEntities(struct relight_ctx_s *ctx, const char *entstring, qboolean ignorestyles);
-void LightShutdown(struct relight_ctx_s *ctx);
+void LightShutdown(struct relight_ctx_s *ctx, struct model_s *model);
 extern const size_t lightthreadctxsize;
 
 qboolean RelightSetup (struct model_s *model, size_t lightsamples, qboolean generatelit);
@@ -699,9 +699,7 @@ extern	qboolean r_softwarebanding;
 extern	cvar_t r_lightprepass_cvar;
 extern	int r_lightprepass;	//0=off,1=16bit,2=32bit
 
-#ifdef R_XFLIP
 extern cvar_t	r_xflip;
-#endif
 
 extern cvar_t gl_mindist, gl_maxdist;
 extern	cvar_t	r_clear;
diff --git a/engine/client/renderer.c b/engine/client/renderer.c
index 7cb57a97f..a3ab6e72b 100644
--- a/engine/client/renderer.c
+++ b/engine/client/renderer.c
@@ -161,8 +161,9 @@ cvar_t r_fb_bmodels							= CVARAFD("r_fb_bmodels", "1",
 													"gl_fb_bmodels", CVAR_SEMICHEAT|CVAR_RENDERERLATCH, "Enables loading lumas on the map, as well as any external bsp models.");
 cvar_t r_fb_models							= CVARAFD  ("r_fb_models", "1",
 													"gl_fb_models", CVAR_SEMICHEAT, "Enables the use of lumas on models. Note that if ruleset_allow_fbmodels is enabled, then all models are unconditionally fullbright in deathmatch, because cheaters would set up their models like that anyway, hurrah for beating them at their own game. QuakeWorld players suck.");
-cvar_t r_skin_overlays						= CVARF  ("r_skin_overlays", "1",
-													CVAR_SEMICHEAT|CVAR_RENDERERLATCH);
+cvar_t gl_overbright_models					= CVARFD("gl_overbright_models", "0", CVAR_SEMICHEAT|CVAR_ARCHIVE, "Doubles the brightness of models, to match QuakeSpasm's misfeature of the same name.");
+//cvar_t r_skin_overlays						= CVARF  ("r_skin_overlays", "1",
+//													CVAR_SEMICHEAT|CVAR_RENDERERLATCH);
 cvar_t r_globalskin_first					= CVARFD  ("r_globalskin_first", "100", CVAR_RENDERERLATCH, "Specifies the first .skin value that is a global skin. Entities within this range will use the shader/image called 'gfx/skinSKIN.lmp' instead of their regular skin. See also: r_globalskin_count.");
 cvar_t r_globalskin_count					= CVARFD  ("r_globalskin_count", "10", CVAR_RENDERERLATCH, "Specifies how many globalskins there are.");
 cvar_t r_coronas							= CVARFD ("r_coronas", "0",	CVAR_ARCHIVE, "Draw coronas on realtime lights. Overrides glquake-esque flashblends.");
@@ -323,6 +324,8 @@ cvar_t	r_stereo_separation					= CVARD("r_stereo_separation", "4", "How far apar
 cvar_t	r_stereo_convergence				= CVARD("r_stereo_convergence", "0", "Nudges the angle of each eye inwards when using stereoscopic rendering.");
 cvar_t	r_stereo_method						= CVARFD("r_stereo_method", "0", CVAR_ARCHIVE, "Value 0 = Off.\nValue 1 = Attempt hardware acceleration. Requires vid_restart.\nValue 2 = red/cyan.\nValue 3 = red/blue.\nValue 4=red/green.\nValue 5=eye strain.");
 
+cvar_t	r_xflip = CVAR("leftisright", "0");
+
 extern cvar_t r_dodgytgafiles;
 extern cvar_t r_dodgypcxfiles;
 extern cvar_t r_keepimages;
@@ -581,10 +584,6 @@ void GLRenderer_Init(void)
 
 	Cvar_Register (&gl_smoothcrosshair, GRAPHICALNICETIES);
 
-#ifdef R_XFLIP
-	Cvar_Register (&r_xflip, GLRENDEREROPTIONS);
-#endif
-
 //	Cvar_Register (&gl_lightmapmode, GLRENDEREROPTIONS);
 
 	Cvar_Register (&gl_picmip, GLRENDEREROPTIONS);
@@ -943,6 +942,7 @@ void Renderer_Init(void)
 	Cvar_Register (&scr_allowsnap, SCREENOPTIONS);
 	Cvar_Register (&scr_consize, SCREENOPTIONS);
 	Cvar_Register (&scr_centersbar, SCREENOPTIONS);
+	Cvar_Register (&r_xflip, GLRENDEREROPTIONS);
 
 	Cvar_Register(&r_bloodstains, GRAPHICALNICETIES);
 
@@ -1002,8 +1002,9 @@ void Renderer_Init(void)
 
 	Cvar_Register (&r_fb_bmodels, GRAPHICALNICETIES);
 	Cvar_Register (&r_fb_models, GRAPHICALNICETIES);
+	Cvar_Register (&gl_overbright_models, GRAPHICALNICETIES);
 //	Cvar_Register (&r_fullbrights, GRAPHICALNICETIES);	//dpcompat: 1 if r_fb_bmodels&&r_fb_models
-	Cvar_Register (&r_skin_overlays, GRAPHICALNICETIES);
+//	Cvar_Register (&r_skin_overlays, GRAPHICALNICETIES);
 	Cvar_Register (&r_globalskin_first, GRAPHICALNICETIES);
 	Cvar_Register (&r_globalskin_count, GRAPHICALNICETIES);
 	Cvar_Register (&r_shadows, GRAPHICALNICETIES);
@@ -1824,7 +1825,7 @@ TRACE(("dbg: R_ApplyRenderer: starting on client state\n"));
 TRACE(("dbg: R_ApplyRenderer: reloading ALL models\n"));
 		for (i=1 ; i<MAX_PRECACHE_MODELS ; i++)
 		{
-			if (!cl.model_name[i][0])
+			if (!cl.model_name[i])
 				break;
 
 			TRACE(("dbg: R_ApplyRenderer: reloading model %s\n", cl.model_name[i]));
@@ -1846,7 +1847,7 @@ TRACE(("dbg: R_ApplyRenderer: reloading ALL models\n"));
 #ifdef HAVE_LEGACY
 		for (i=0; i < MAX_VWEP_MODELS; i++)
 		{
-			if (*cl.model_name_vwep[i])
+			if (cl.model_name_vwep[i])
 				cl.model_precache_vwep[i] = Mod_ForName (cl.model_name_vwep[i], MLV_SILENT);
 			else
 				cl.model_precache_vwep[i] = NULL;
@@ -2201,7 +2202,8 @@ void R_RestartRenderer (rendererstate_t *newr)
 	rendererstate_t oldr;
 	if (r_blockvidrestart)
 	{
-		Con_TPrintf("Ignoring vid_restart from config\n");
+		if (r_blockvidrestart != 2)
+			Con_TPrintf("Unable to restart renderer at this time\n");
 		return;
 	}
 
@@ -2324,6 +2326,13 @@ void R_RestartRenderer_f (void)
 	double time;
 	rendererstate_t newr;
 
+	if (r_blockvidrestart)
+	{
+		if (r_blockvidrestart!=2)
+			Con_TPrintf("Ignoring vid_restart from config\n");
+		return;
+	}
+
 	Cvar_ApplyLatches(CVAR_VIDEOLATCH|CVAR_RENDERERLATCH, false);
 	if (!R_BuildRenderstate(&newr, vid_renderer.string))
 	{
@@ -2558,72 +2567,6 @@ mspriteframe_t *R_GetSpriteFrame (entity_t *currententity)
 	return pspriteframe;
 }
 
-/*
-void MYgluPerspective(double fovx, double fovy, double zNear, double zFar)
-{
-	Matrix4_Projection_Far(r_refdef.m_projection, fovx, fovy, zNear, zFar);
-}
-
-void GL_InfinatePerspective(double fovx, double fovy,
-		     double zNear)
-{
-	// nudge infinity in just slightly for lsb slop
-    float nudge = 1;// - 1.0 / (1<<23);
-
-	double xmin, xmax, ymin, ymax;
-
-	ymax = zNear * tan( fovy * M_PI / 360.0 );
-	ymin = -ymax;
-
-	xmax = zNear * tan( fovx * M_PI / 360.0 );
-	xmin = -xmax;
-
-	r_projection_matrix[0] = (2*zNear) / (xmax - xmin);
-	r_projection_matrix[4] = 0;
-	r_projection_matrix[8] = (xmax + xmin) / (xmax - xmin);
-	r_projection_matrix[12] = 0;
-
-	r_projection_matrix[1] = 0;
-	r_projection_matrix[5] = (2*zNear) / (ymax - ymin);
-	r_projection_matrix[9] = (ymax + ymin) / (ymax - ymin);
-	r_projection_matrix[13] = 0;
-
-	r_projection_matrix[2] = 0;
-	r_projection_matrix[6] = 0;
-	r_projection_matrix[10] = -1  * nudge;
-	r_projection_matrix[14] = -2*zNear * nudge;
-
-	r_projection_matrix[3] = 0;
-	r_projection_matrix[7] = 0;
-	r_projection_matrix[11] = -1;
-	r_projection_matrix[15] = 0;
-}
-
-void GL_ParallelPerspective(double xmin, double xmax, double ymax, double ymin,
-		     double znear, double zfar)
-{
-	r_projection_matrix[0] = 2/(xmax-xmin);
-	r_projection_matrix[4] = 0;
-	r_projection_matrix[8] = 0;
-	r_projection_matrix[12] = (xmax+xmin)/(xmax-xmin);
-
-	r_projection_matrix[1] = 0;
-	r_projection_matrix[5] = 2/(ymax-ymin);
-	r_projection_matrix[9] = 0;
-	r_projection_matrix[13] = (ymax+ymin)/(ymax-ymin);
-
-	r_projection_matrix[2] = 0;
-	r_projection_matrix[6] = 0;
-	r_projection_matrix[10] = -2/(zfar-znear);
-	r_projection_matrix[14] = (zfar+znear)/(zfar-znear);
-
-	r_projection_matrix[3] = 0;
-	r_projection_matrix[7] = 0;
-	r_projection_matrix[11] = 0;
-	r_projection_matrix[15] = 1;
-}
-*/
-
 
 /*
 ===============
diff --git a/engine/client/sbar.c b/engine/client/sbar.c
index bb2d7a145..7af7b3c15 100644
--- a/engine/client/sbar.c
+++ b/engine/client/sbar.c
@@ -2401,7 +2401,7 @@ void Sbar_DrawScoreboard (playerview_t *pv)
 #endif
 
 	isdead = false;
-	if (pv->spectator && (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV))
+	if (pv->spectator && cls.demoplayback == DPB_MVD)
 	{
 		int t = pv->cam_spec_track;
 		if (t >= 0 && CAM_ISLOCKED(pv) && cl.players[t].statsf[STAT_HEALTH] <= 0)
@@ -3544,14 +3544,14 @@ ping time frags name
 		sprintf(num, S_COLOR_WHITE"%4i", p);			\
 	else												\
 		sprintf(num, S_COLOR_GREEN"%4i", p);							\
-	Draw_FunStringWidth(x, y, num, 4*8, false, false);	\
+	Draw_FunStringWidth(x, y, num, 4*8+4, false, highlight);	\
 },NOFILL)
 
 #define COLUMN_PL COLUMN(pl, 2*8,						\
 {														\
 	int p = s->pl;										\
 	sprintf(num, "%2i", p);								\
-	Draw_FunStringWidth(x, y, num, 2*8, false, false);	\
+	Draw_FunStringWidth(x, y, num, 2*8+4, false, highlight);	\
 },NOFILL)
 #define COLUMN_TIME COLUMN(time, 4*8,					\
 {														\
@@ -3563,14 +3563,14 @@ ping time frags name
 		minutes = (int)total/60;						\
 		sprintf (num, "%4i", minutes);					\
 	}													\
-	Draw_FunStringWidth(x, y, num, 4*8, false, false);	\
+	Draw_FunStringWidth(x, y, num, 4*8+4, false, highlight);	\
 },NOFILL)
 #define COLUMN_FRAGS COLUMN(frags, 5*8,					\
 {	\
 	int cx; int cy;										\
 	if (s->spectator && s->spectator != 2)				\
 	{													\
-		Draw_FunStringWidth(x, y, "spectator", 5*8, false, false);	\
+		Draw_FunStringWidth(x, y, "spectator", 5*8+4, false, false);	\
 	}													\
 	else												\
 	{													\
@@ -3607,7 +3607,7 @@ ping time frags name
 {														\
 	if (!s->spectator)									\
 	{													\
-		Draw_FunStringWidth(x, y, s->team, 4*8, false, false);			\
+		Draw_FunStringWidth(x, y, s->team, 4*8+4, false, highlight);			\
 	}													\
 },NOFILL)
 #define COLUMN_STAT(title, width, code, fill) COLUMN(title, width, {	\
@@ -3616,13 +3616,13 @@ ping time frags name
 		code															\
 	}																	\
 }, fill)
-#define COLUMN_RULESET COLUMN(ruleset, 8*8,	{Draw_FunStringWidth(x, y, s->ruleset, 8*8, false, false);},NOFILL)
-#define COLUMN_NAME COLUMN(name, namesize,	{Draw_FunStringWidth(x, y, s->name, namesize, false, false);},NOFILL)
-#define COLUMN_KILLS COLUMN_STAT(kils, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetKills(k)), 4*8, false, false);},NOFILL)
-#define COLUMN_TKILLS COLUMN_STAT(tkil, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetTKills(k)), 4*8, false, false);},NOFILL)
-#define COLUMN_DEATHS COLUMN_STAT(dths, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetDeaths(k)), 4*8, false, false);},NOFILL)
-#define COLUMN_TOUCHES COLUMN_STAT(tchs, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetTouches(k)), 4*8, false, false);},NOFILL)
-#define COLUMN_CAPS COLUMN_STAT(caps, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetCaptures(k)), 4*8, false, false);},NOFILL)
+#define COLUMN_RULESET COLUMN(ruleset, 8*8,	{Draw_FunStringWidth(x, y, s->ruleset, 8*8+4, false, false);},NOFILL)
+#define COLUMN_NAME COLUMN(name, namesize,	{Draw_FunStringWidth(x, y, s->name, namesize, false, highlight);},NOFILL)
+#define COLUMN_KILLS COLUMN_STAT(kils, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetKills(k)), 4*8+4, false, false);},NOFILL)
+#define COLUMN_TKILLS COLUMN_STAT(tkil, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetTKills(k)), 4*8+4, false, false);},NOFILL)
+#define COLUMN_DEATHS COLUMN_STAT(dths, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetDeaths(k)), 4*8+4, false, false);},NOFILL)
+#define COLUMN_TOUCHES COLUMN_STAT(tchs, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetTouches(k)), 4*8+4, false, false);},NOFILL)
+#define COLUMN_CAPS COLUMN_STAT(caps, 4*8, {Draw_FunStringWidth(x, y, va("%4i", Stats_GetCaptures(k)), 4*8+4, false, false);},NOFILL)
 #define COLUMN_AFK COLUMN(afk, 0, {int cs = atoi(InfoBuf_ValueForKey(&s->userinfo, "chat")); if (cs)Draw_FunStringWidth(x+4, y, (cs&2)?"afk":"msg", 4*8, false, false);},NOFILL)
 
 
@@ -3658,12 +3658,13 @@ void Sbar_DeathmatchOverlay (playerview_t *pv, int start)
 
 	int pages;
 	int linesperpage, firstline, lastline;
+	int highlight;
 
 	if (!pv)
 		return;
 
 // request new ping times every two second
-	if (realtime - cl.last_ping_request > 2	&& cls.demoplayback != DPB_EZTV)
+	if (realtime - cl.last_ping_request > 2	&& !cls.demoplayback)
 	{
 		if (cls.protocol == CP_QUAKEWORLD)
 		{
@@ -3944,6 +3945,18 @@ if (showcolumns & (1<<COLUMN##title)) \
 			isme =	(pv->cam_state == CAM_FREECAM && k == pv->playernum) ||
 					(pv->cam_state != CAM_FREECAM && k == pv->cam_spec_track);
 
+			if ((key_dest_absolutemouse & key_dest_mask & ~kdm_game) &&
+				!Key_Dest_Has(~kdm_game) &&
+				mousecursor_x >= startx && mousecursor_x < startx+rank_width &&
+				mousecursor_y >= y && mousecursor_y < y+skip)
+			{
+				highlight = 2;
+				cl.mouseplayerview = pv;
+				cl.mousenewtrackplayer = k;
+			}
+			else
+				highlight = 0;
+
 			x = startx;
 #define COLUMN(title, width, code, fills) \
 if (showcolumns & (1<<COLUMN##title)) \
@@ -4018,6 +4031,9 @@ static void Sbar_MiniDeathmatchOverlay (playerview_t *pv)
 		top = Sbar_TopColour(s);
 		bottom = Sbar_BottomColour(s);
 
+		if (S_Voip_Speaking(k))
+			Sbar_FillPCDark (x, py, ((cl.teamplay && !consistentteams)?40:0)+48+MAX_DISPLAYEDNAME*8, 8, 0x00ff00, scr_scoreboard_backgroundalpha.value*scr_scoreboard_fillalpha.value);
+
 		Sbar_FillPC ( x, py+1, 40, 3, top);
 		Sbar_FillPC ( x, py+4, 40, 4, bottom);
 		py += 8;
diff --git a/engine/client/skin.c b/engine/client/skin.c
index 1f5633c02..7ba9b362a 100644
--- a/engine/client/skin.c
+++ b/engine/client/skin.c
@@ -488,17 +488,17 @@ void Skin_NextDownload (void)
 				CL_CheckOrEnqueDownloadFile(va("players/%s/tris.md2", skinname), NULL, 0);
 				for (j = 1; j < MAX_PRECACHE_MODELS; j++)
 				{
+					if (!cl.model_name[j])
+						break;
 					if (cl.model_name[j][0] == '#')
 						CL_CheckOrEnqueDownloadFile(va("players/%s/%s", skinname, cl.model_name[j]+1), NULL, 0);
-					if (!*cl.model_name[j])
-						break;
 				}
 				for (j = 1; j < MAX_PRECACHE_SOUNDS; j++)
 				{
+					if (!cl.sound_name[j])
+						break;
 					if (cl.sound_name[j][0] == '*')
 						CL_CheckOrEnqueDownloadFile(va("players/%s/%s", skinname, cl.sound_name[j]+1), NULL, 0);
-					if (!*cl.sound_name[j])
-						break;
 				}
 				*slash = '/';
 				CL_CheckOrEnqueDownloadFile(va("players/%s.pcx", skinname), NULL, 0);
diff --git a/engine/client/snd_al.c b/engine/client/snd_al.c
index bdace0239..2805eb8d1 100644
--- a/engine/client/snd_al.c
+++ b/engine/client/snd_al.c
@@ -53,6 +53,9 @@ We also have no doppler with WebAudio.
 #ifdef OPENAL_STATIC
 #include <AL/al.h>	//output
 #include <AL/alc.h>	//context+input
+#ifdef USEEFX
+#include <AL/efx.h>
+#endif
 
 #ifndef AL_API
 #define AL_API
@@ -103,6 +106,13 @@ We also have no doppler with WebAudio.
 
 #define palGetProcAddress alGetProcAddress
 
+//voip stuff
+#define palcCaptureOpenDevice	alcCaptureOpenDevice
+#define palcCaptureCloseDevice	alcCaptureCloseDevice
+#define palcCaptureStart		alcCaptureStart
+#define palcCaptureStop			alcCaptureStop
+#define palcCaptureSamples		alcCaptureSamples
+
 #ifdef FTE_TARGET_WEB	//emscripten sucks.
 AL_API void (AL_APIENTRY alSpeedOfSound)( ALfloat value ) {}
 #endif
@@ -115,6 +125,8 @@ AL_API void (AL_APIENTRY alSpeedOfSound)( ALfloat value ) {}
 #endif
 #define AL_API
 
+#undef AL_ALEXT_PROTOTYPES
+
 
 typedef int ALint;
 typedef unsigned int ALuint;
@@ -131,6 +143,7 @@ static qboolean openallib_tried;
 static AL_API ALenum (AL_APIENTRY *palGetError)( void );
 static AL_API void (AL_APIENTRY *palSourcef)( ALuint sid, ALenum param, ALfloat value ); 
 static AL_API void (AL_APIENTRY *palSourcei)( ALuint sid, ALenum param, ALint value ); 
+static AL_API void (AL_APIENTRY *palSource3i)(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3);
 
 static AL_API void (AL_APIENTRY *palSourcePlayv)( ALsizei ns, const ALuint *sids );
 static AL_API void (AL_APIENTRY *palSourceStopv)( ALsizei ns, const ALuint *sids );
@@ -251,19 +264,17 @@ static ALC_API void*           (ALC_APIENTRY *palcGetProcAddress)(ALCdevice *dev
 
 #if defined(VOICECHAT)
 //capture-specific stuff
-static ALC_API void           (ALC_APIENTRY *palcGetIntegerv)( ALCdevice *device, ALCenum param, ALCsizei size, ALCint *data );
-static ALC_API ALCdevice *    (ALC_APIENTRY *palcCaptureOpenDevice)( const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize );
-static ALC_API ALCboolean     (ALC_APIENTRY *palcCaptureCloseDevice)( ALCdevice *device );
-static ALC_API void           (ALC_APIENTRY *palcCaptureStart)( ALCdevice *device );
-static ALC_API void           (ALC_APIENTRY *palcCaptureStop)( ALCdevice *device );
-static ALC_API void           (ALC_APIENTRY *palcCaptureSamples)( ALCdevice *device, ALCvoid *buffer, ALCsizei samples );
+static void           (ALC_APIENTRY *palcGetIntegerv)( ALCdevice *device, ALCenum param, ALCsizei size, ALCint *data );
+static ALCdevice *    (ALC_APIENTRY *palcCaptureOpenDevice)( const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize );
+static ALCboolean     (ALC_APIENTRY *palcCaptureCloseDevice)( ALCdevice *device );
+static void           (ALC_APIENTRY *palcCaptureStart)( ALCdevice *device );
+static void           (ALC_APIENTRY *palcCaptureStop)( ALCdevice *device );
+static void           (ALC_APIENTRY *palcCaptureSamples)( ALCdevice *device, ALCvoid *buffer, ALCsizei samples );
 #define ALC_CAPTURE_DEVICE_SPECIFIER             0x310
 #define ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER     0x311
 #define ALC_CAPTURE_SAMPLES                      0x312
 #endif
 
-#endif
-
 
 //efx
 #ifdef USEEFX
@@ -312,18 +323,32 @@ static ALC_API void           (ALC_APIENTRY *palcCaptureSamples)( ALCdevice *dev
 #define AL_EAXREVERB_LFREFERENCE                 0x0015
 #define AL_EAXREVERB_ROOM_ROLLOFF_FACTOR         0x0016
 #define AL_EAXREVERB_DECAY_HFLIMIT               0x0017
-static AL_API void (AL_APIENTRY *palSource3i)(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3);
+#endif
+#endif
 
-static AL_API void (AL_APIENTRY *palAuxiliaryEffectSloti)(ALuint effectslot, ALenum param, ALint iValue);
-static AL_API ALvoid (AL_APIENTRY *palGenAuxiliaryEffectSlots)(ALsizei n, ALuint *effectslots);
-static AL_API ALvoid (AL_APIENTRY *palDeleteAuxiliaryEffectSlots)(ALsizei n, const ALuint *effectslots);
-static AL_API ALvoid (AL_APIENTRY *palDeleteEffects)(ALsizei n, const ALuint *effects);
+#ifdef USEEFX
+	#if defined(AL_ALEXT_PROTOTYPES) && defined(OPENAL_STATIC)
+		#define	palAuxiliaryEffectSloti			alAuxiliaryEffectSloti
+		#define	palGenAuxiliaryEffectSlots		alGenAuxiliaryEffectSlots
+		#define	palDeleteAuxiliaryEffectSlots	alDeleteAuxiliaryEffectSlots
+		#define	palDeleteEffects				alDeleteEffects
+		#define	palGenEffects					alGenEffects
+		#define	palEffecti						alEffecti
+//		#define	palEffectiv						alEffectiv
+		#define	palEffectf						alEffectf
+		#define	palEffectfv						alEffectfv
+	#else
+		static void (AL_APIENTRY *palAuxiliaryEffectSloti)(ALuint effectslot, ALenum param, ALint iValue);
+		static ALvoid (AL_APIENTRY *palGenAuxiliaryEffectSlots)(ALsizei n, ALuint *effectslots);
+		static ALvoid (AL_APIENTRY *palDeleteAuxiliaryEffectSlots)(ALsizei n, const ALuint *effectslots);
+		static ALvoid (AL_APIENTRY *palDeleteEffects)(ALsizei n, const ALuint *effects);
 
-static AL_API ALvoid (AL_APIENTRY *palGenEffects)(ALsizei n, ALuint *effects);
-static AL_API ALvoid (AL_APIENTRY *palEffecti)(ALuint effect, ALenum param, ALint iValue);
-static AL_API ALvoid (AL_APIENTRY *palEffectiv)(ALuint effect, ALenum param, const ALint *piValues);
-static AL_API ALvoid (AL_APIENTRY *palEffectf)(ALuint effect, ALenum param, ALfloat flValue);
-static AL_API ALvoid (AL_APIENTRY *palEffectfv)(ALuint effect, ALenum param, const ALfloat *pflValues);
+		static ALvoid (AL_APIENTRY *palGenEffects)(ALsizei n, ALuint *effects);
+		static ALvoid (AL_APIENTRY *palEffecti)(ALuint effect, ALenum param, ALint iValue);
+//		static ALvoid (AL_APIENTRY *palEffectiv)(ALuint effect, ALenum param, const ALint *piValues);
+		static ALvoid (AL_APIENTRY *palEffectf)(ALuint effect, ALenum param, ALfloat flValue);
+		static ALvoid (AL_APIENTRY *palEffectfv)(ALuint effect, ALenum param, const ALfloat *pflValues);
+	#endif
 #endif
 
 //AL_EXT_float32
@@ -1084,13 +1109,10 @@ static void OpenAL_ChannelUpdate(soundcardinfo_t *sc, channel_t *chan, chanupdat
 		palSourcef(src, AL_PITCH, pitch);
 
 #ifdef USEEFX
-		if (palSource3i)
-		{
-			if (chan->flags & CF_NOREVERB)	//don't do the underwater thing on static sounds. it sounds like arse with all those sources.
-				palSource3i(src, AL_AUXILIARY_SEND_FILTER, 0, 0, AL_FILTER_NULL);
-			else
-				palSource3i(src, AL_AUXILIARY_SEND_FILTER, oali->effectslot, 0, AL_FILTER_NULL);
-		}
+		if (chan->flags & CF_NOREVERB)	//don't do the underwater thing on static sounds. it sounds like arse with all those sources.
+			palSource3i(src, AL_AUXILIARY_SEND_FILTER, 0, 0, AL_FILTER_NULL);
+		else
+			palSource3i(src, AL_AUXILIARY_SEND_FILTER, oali->effectslot, 0, AL_FILTER_NULL);
 #endif
 
 		palSourcei(src, AL_LOOPING, (!stream && ((chan->flags & CF_FORCELOOP)||(sfx->loopstart>=0&&!stream)))?AL_TRUE:AL_FALSE);
@@ -1205,6 +1227,7 @@ static qboolean OpenAL_InitLibrary(void)
 		{(void*)&palGetError, "alGetError"},
 		{(void*)&palSourcef, "alSourcef"},
 		{(void*)&palSourcei, "alSourcei"},
+		{(void*)&palSource3i, "alSource3i"},
 		{(void*)&palSourcePlayv, "alSourcePlayv"},
 		{(void*)&palSourceStopv, "alSourceStopv"},
 		{(void*)&palSourcePlay, "alSourcePlay"},
@@ -1238,6 +1261,7 @@ static qboolean OpenAL_InitLibrary(void)
 		{(void*)&palcMakeContextCurrent, "alcMakeContextCurrent"},
 		{(void*)&palcProcessContext, "alcProcessContext"},
 		{(void*)&palcGetString, "alcGetString"},
+		{(void*)&palcGetIntegerv, "alcGetIntegerv"},
 		{(void*)&palcIsExtensionPresent, "alcIsExtensionPresent"},
 		{(void*)&palcGetProcAddress, "alcGetProcAddress"},
 		{NULL}
@@ -1854,16 +1878,17 @@ static qboolean QDECL OpenAL_InitCard2(soundcardinfo_t *sc, const char *devname,
 
 #ifdef USEEFX
 		PrintALError("preeffects");
-		palSource3i = palGetProcAddress("alSource3i");
+	#ifndef AL_ALEXT_PROTOTYPES
 		palAuxiliaryEffectSloti = palGetProcAddress("alAuxiliaryEffectSloti");
 		palGenAuxiliaryEffectSlots = palGetProcAddress("alGenAuxiliaryEffectSlots");
 		palDeleteAuxiliaryEffectSlots = palGetProcAddress("alDeleteAuxiliaryEffectSlots");
 		palDeleteEffects = palGetProcAddress("alDeleteEffects");
 		palGenEffects = palGetProcAddress("alGenEffects");
 		palEffecti = palGetProcAddress("alEffecti");
-		palEffectiv = palGetProcAddress("alEffectiv");
+//		palEffectiv = palGetProcAddress("alEffectiv");
 		palEffectf = palGetProcAddress("alEffectf");
 		palEffectfv = palGetProcAddress("alEffectfv");
+	#endif
 
 		if (palGenAuxiliaryEffectSlots && s_al_use_reverb.ival)
 			palGenAuxiliaryEffectSlots(1, &oali->effectslot);
@@ -1915,10 +1940,11 @@ static qboolean OpenAL_InitCapture(void)
 	//if (!palcIsExtensionPresent(NULL, "ALC_EXT_capture"))
 	//	return false;
 
+#ifdef OPENAL_STATIC
+	return true;
+#else
 	if(!palcCaptureOpenDevice)
 	{
-		palcGetIntegerv = Sys_GetAddressForName(openallib, "alcGetIntegerv");
-
 		palcCaptureOpenDevice = Sys_GetAddressForName(openallib, "alcCaptureOpenDevice");
 		palcCaptureStart = Sys_GetAddressForName(openallib, "alcCaptureStart");
 		palcCaptureSamples = Sys_GetAddressForName(openallib, "alcCaptureSamples");
@@ -1927,6 +1953,7 @@ static qboolean OpenAL_InitCapture(void)
 	}
 
 	return palcGetIntegerv&&palcCaptureOpenDevice&&palcCaptureStart&&palcCaptureSamples&&palcCaptureStop&&palcCaptureCloseDevice;
+#endif
 }
 static qboolean QDECL OPENAL_Capture_Enumerate (void (QDECL *callback) (const char *drivername, const char *devicecode, const char *readablename))
 {
@@ -1955,8 +1982,13 @@ static void *QDECL OPENAL_Capture_Init (int samplerate, const char *device)
 
 	if (!device || !*device)
 	{
+#if defined(FTE_TARGET_WEB) && (__EMSCRIPTEN_major__>2 || (__EMSCRIPTEN_major__==2&&__EMSCRIPTEN_tiny__>=14))
+		//emscripten, and recent enough to actually work. don't check s_al_disable here as we don't have dsound/alsa fallbacks and we do want to actually use it.
+		//older versions of emscripten are too buggy to use.
+#else
 		if (s_al_disable.ival)
 			return NULL;	//no default device
+#endif
 		device = palcGetString(NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER);
 	}
 
diff --git a/engine/client/snd_alsa.c b/engine/client/snd_alsa.c
index b4c4d0e55..bba0c1393 100755
--- a/engine/client/snd_alsa.c
+++ b/engine/client/snd_alsa.c
@@ -38,41 +38,41 @@
 
 static void *alsasharedobject;
 
-int (*psnd_pcm_open)				(snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode);
-int (*psnd_pcm_close)				(snd_pcm_t *pcm);
-int (*psnd_config_update_free_global)(void);
-const char *(*psnd_strerror)			(int errnum);
-int (*psnd_pcm_hw_params_any)			(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
-int (*psnd_pcm_hw_params_set_access)		(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t _access);
-int (*psnd_pcm_hw_params_set_format)		(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val);
-int (*psnd_pcm_hw_params_set_channels)		(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val);
-int (*psnd_pcm_hw_params_set_rate_near)		(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir);
-int (*psnd_pcm_hw_params_set_period_size_near)	(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir);
-int (*psnd_pcm_hw_params)			(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
-int (*psnd_pcm_sw_params_current)		(snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
-int (*psnd_pcm_sw_params_set_start_threshold)	(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val);
-int (*psnd_pcm_sw_params_set_stop_threshold)	(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val);
-int (*psnd_pcm_sw_params)			(snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
-int (*psnd_pcm_hw_params_get_buffer_size)	(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val);
-int (*psnd_pcm_hw_params_set_buffer_size_near)	(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val);
-int (*psnd_pcm_set_params)			(snd_pcm_t *pcm, snd_pcm_format_t format, snd_pcm_access_t access, unsigned int channels, unsigned int rate, int soft_resample, unsigned int latency);
-snd_pcm_sframes_t (*psnd_pcm_avail_update)	(snd_pcm_t *pcm);
-snd_pcm_state_t (*psnd_pcm_state)		(snd_pcm_t *pcm);
-int (*psnd_pcm_start)				(snd_pcm_t *pcm);
-int (*psnd_pcm_recover)				(snd_pcm_t *pcm, int err, int silent);
+static int (*psnd_pcm_open)				(snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode);
+static int (*psnd_pcm_close)				(snd_pcm_t *pcm);
+static int (*psnd_config_update_free_global)(void);
+static const char *(*psnd_strerror)			(int errnum);
+static int (*psnd_pcm_hw_params_any)			(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
+static int (*psnd_pcm_hw_params_set_access)		(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t _access);
+static int (*psnd_pcm_hw_params_set_format)		(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val);
+static int (*psnd_pcm_hw_params_set_channels)		(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val);
+static int (*psnd_pcm_hw_params_set_rate_near)		(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir);
+static int (*psnd_pcm_hw_params_set_period_size_near)	(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val, int *dir);
+static int (*psnd_pcm_hw_params)			(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
+static int (*psnd_pcm_sw_params_current)		(snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
+static int (*psnd_pcm_sw_params_set_start_threshold)	(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val);
+static int (*psnd_pcm_sw_params_set_stop_threshold)	(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val);
+static int (*psnd_pcm_sw_params)			(snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
+static int (*psnd_pcm_hw_params_get_buffer_size)	(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val);
+static int (*psnd_pcm_hw_params_set_buffer_size_near)	(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val);
+static int (*psnd_pcm_set_params)			(snd_pcm_t *pcm, snd_pcm_format_t format, snd_pcm_access_t access, unsigned int channels, unsigned int rate, int soft_resample, unsigned int latency);
+static snd_pcm_sframes_t (*psnd_pcm_avail_update)	(snd_pcm_t *pcm);
+static snd_pcm_state_t (*psnd_pcm_state)		(snd_pcm_t *pcm);
+static int (*psnd_pcm_start)				(snd_pcm_t *pcm);
+static int (*psnd_pcm_recover)				(snd_pcm_t *pcm, int err, int silent);
 
-size_t (*psnd_pcm_hw_params_sizeof)		(void);
-size_t (*psnd_pcm_sw_params_sizeof)		(void);
+static size_t (*psnd_pcm_hw_params_sizeof)		(void);
+static size_t (*psnd_pcm_sw_params_sizeof)		(void);
 
-int (*psnd_pcm_mmap_begin)			(snd_pcm_t *pcm, const snd_pcm_channel_area_t **areas, snd_pcm_uframes_t *offset, snd_pcm_uframes_t *frames);
-snd_pcm_sframes_t (*psnd_pcm_mmap_commit)	(snd_pcm_t *pcm, snd_pcm_uframes_t offset, snd_pcm_uframes_t frames);
+static int (*psnd_pcm_mmap_begin)			(snd_pcm_t *pcm, const snd_pcm_channel_area_t **areas, snd_pcm_uframes_t *offset, snd_pcm_uframes_t *frames);
+static snd_pcm_sframes_t (*psnd_pcm_mmap_commit)	(snd_pcm_t *pcm, snd_pcm_uframes_t offset, snd_pcm_uframes_t frames);
 
-snd_pcm_sframes_t (*psnd_pcm_writei)		(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size);
-int (*psnd_pcm_prepare)				(snd_pcm_t *pcm);
+static snd_pcm_sframes_t (*psnd_pcm_writei)		(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size);
+static int (*psnd_pcm_prepare)				(snd_pcm_t *pcm);
 
-int 	(*psnd_device_name_hint)		(int card, const char *iface, void ***hints);
-char * 	(*psnd_device_name_get_hint)	(const void *hint, const char *id);
-int		(*psnd_device_name_free_hint)	(void **hints);
+static int 	(*psnd_device_name_hint)		(int card, const char *iface, void ***hints);
+static char * 	(*psnd_device_name_get_hint)	(const void *hint, const char *id);
+static int		(*psnd_device_name_free_hint)	(void **hints);
 
 
 static unsigned int ALSA_MMap_GetDMAPos (soundcardinfo_t *sc)
diff --git a/engine/client/snd_dma.c b/engine/client/snd_dma.c
index 2b74304cc..3442e3f1e 100644
--- a/engine/client/snd_dma.c
+++ b/engine/client/snd_dma.c
@@ -92,13 +92,8 @@ cvar_t snd_precache				= CVARAF(	"s_precache", "1",
 cvar_t snd_loadas8bit			= CVARAFD(	"s_loadas8bit", "0",
 											"loadas8bit", CVAR_ARCHIVE,
 											"Downsample sounds on load as lower quality 8-bit sound, to save memory.");
-#ifdef FTE_TARGET_WEB
-cvar_t snd_loadasstereo			= CVARD(	"snd_loadasstereo", "1",
-											"Force mono sounds to load as if stereo ones, to waste memory. Used to work around stupid browser bugs.");
-#else
 cvar_t snd_loadasstereo			= CVARD(	"snd_loadasstereo", "0",
 											"Force mono sounds to load as if stereo ones, to waste memory. Not normally useful.");
-#endif
 cvar_t ambient_level			= CVARAFD(	"s_ambientlevel", "0.3",
 											"ambient_level", CVAR_ARCHIVE,
 											"This controls the volume levels of automatic area-based sounds (like water or sky), and is quite annoying. If you're playing deathmatch you'll definitely want this OFF.");
@@ -1091,6 +1086,7 @@ static float S_Voip_Preprocess(short *start, unsigned int samples, float micamp)
 }
 static void S_Voip_TryInitCaptureContext(char *driver, char *device, int rate)
 {
+	static float throttle;
 	int i;
 
 	s_voip.cdriver = NULL;
@@ -1114,12 +1110,12 @@ static void S_Voip_TryInitCaptureContext(char *driver, char *device, int rate)
 	if (!s_voip.cdriver)
 	{
 		if (!driver)
-			Con_Printf("No microphone drivers supported\n");
+			Con_ThrottlePrintf(&throttle, 0, CON_ERROR"No microphone drivers supported\n");
 		else
-			Con_Printf("Microphone driver \"%s\" is not valid\n", driver);
+			Con_ThrottlePrintf(&throttle, 0, CON_ERROR"Microphone driver \"%s\" is not valid\n", driver);
 	}
 	else
-		Con_Printf("No microphone detected\n");
+		Con_ThrottlePrintf(&throttle, 0, CON_ERROR"No microphone detected\n");
 	s_voip.cdriver = NULL;
 }
 
@@ -1388,7 +1384,7 @@ void S_Voip_Transmit(unsigned char clc, sizebuf_t *buf)
 
 	s_voip.capturepos += s_voip.cdriver->Update(s_voip.cdriverctx, (unsigned char*)s_voip.capturebuf + s_voip.capturepos, s_voip.encframesize*2, sizeof(s_voip.capturebuf) - s_voip.capturepos);
 
-	if (!s_voip.wantsend && s_voip.capturepos < s_voip.encframesize*2)
+	if (!voipsendenable || (!s_voip.wantsend && s_voip.capturepos < s_voip.encframesize*2))
 	{
 		s_voip.voiplevel = -1;
 		s_voip.capturepos = 0;
@@ -1710,10 +1706,10 @@ void S_Voip_MapChange(void)
 }
 int S_Voip_Loudness(qboolean ignorevad)
 {
-	if (s_voip.voiplevel > 100)
-		return 100;
 	if (!s_voip.cdriverctx || (!ignorevad && s_voip.dumps))
 		return -1;
+	if (s_voip.voiplevel > 100)
+		return 100;
 	return s_voip.voiplevel;
 }
 int S_Voip_ClientLoudness(unsigned int plno)
@@ -1770,6 +1766,10 @@ void S_Voip_Parse(void)
 	bytes = MSG_ReadShort();
 	MSG_ReadSkip(bytes);
 }
+int S_Voip_ClientLoudness(unsigned int plno)
+{
+	return -1;
+}
 #endif
 
 
@@ -2188,7 +2188,7 @@ void S_DoRestart (qboolean onlyifneeded)
 
 	for (i=1 ; i<MAX_PRECACHE_SOUNDS ; i++)
 	{
-		if (!cl.sound_name[i][0])
+		if (!cl.sound_name[i])
 			break;
 		cl.sound_precache[i] = S_FindName (cl.sound_name[i], true, false);
 	}
@@ -2710,7 +2710,7 @@ static void SND_AccumulateSpacialization(soundcardinfo_t *sc, channel_t *ch, vec
 	listener_vec[1] = DotProduct(listener[seat].right, world_vec);
 	listener_vec[2] = DotProduct(listener[seat].up, world_vec);
 
-	if (snd_leftisright.ival)
+	if (snd_leftisright.ival^r_xflip.ival)
 		listener_vec[1] = -listener_vec[1];
 
 	for (i = 0; i < sc->sn.numchannels; i++)
@@ -2859,7 +2859,7 @@ static void SND_Spatialize(soundcardinfo_t *sc, channel_t *ch)
 	listener_vec[1] = DotProduct(listener[seat].right, world_vec);
 	listener_vec[2] = DotProduct(listener[seat].up, world_vec);
 
-	if (snd_leftisright.ival)
+	if (snd_leftisright.ival^r_xflip.ival)
 		listener_vec[1] = -listener_vec[1];
 
 	for (i = 0; i < sc->sn.numchannels; i++)
diff --git a/engine/client/snd_mem.c b/engine/client/snd_mem.c
index b6987b316..17e574b2a 100644
--- a/engine/client/snd_mem.c
+++ b/engine/client/snd_mem.c
@@ -37,10 +37,6 @@ typedef struct
 
 static wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength);
 
-int			cache_full_cycle;
-
-qbyte *S_Alloc (int size);
-
 #define LINEARUPSCALE(in, inrate, insamps, out, outrate, outlshift, outrshift) \
 	{ \
 		scale = inrate / (double)outrate; \
@@ -822,9 +818,54 @@ static qboolean QDECL S_LoadWavSound (sfx_t *s, qbyte *data, size_t datalen, int
 	return ResampleSfx (s, info.rate, info.numchannels, format, info.samples, info.loopstart, data + info.dataofs);
 }
 
-qboolean QDECL S_LoadOVSound (sfx_t *s, qbyte *data, size_t datalen, int sndspeed, qboolean forcedecode);
-
 #ifdef FTE_TARGET_WEB
+#if 1
+void S_BrowserDecoded (void *ctx, void *dataptr, int frames, int channels, float rate)
+{
+	sfx_t *sfx = ctx;
+
+	//make sure we were not restarting at the time... FIXME: make stricter?
+	extern sfx_t		*known_sfx;
+	extern int			num_sfx;
+	int id = sfx-known_sfx;
+	if (id < 0 || id >= num_sfx || sfx != &known_sfx[id])
+		return; //err... don't crash out!
+
+	sfx->loopstart = -1;
+	if (dataptr)
+	{	//okay, something loaded. woo.
+		Z_Free(sfx->decoder.buf);
+		sfx->decoder.buf = NULL;
+		sfx->decoder.decodedata = NULL;
+		ResampleSfx (sfx, rate, channels, QAF_S16, frames, -1, dataptr);
+	}
+	else
+	{
+		Con_Printf(CON_WARNING"Failed to decode %s\n", sfx->name);
+		sfx->loadstate = SLS_FAILED;
+	}
+}
+static qboolean QDECL S_LoadBrowserFile (sfx_t *s, qbyte *data, size_t datalen, int sndspeed, qboolean forcedecode)
+{
+	struct sfxcache_s *buf;
+
+	if (datalen > 4 && !strncmp(data, "RIFF", 4))
+		return false;	//do NOT use this code for wav files. we have no way to read the looping flags which would break things in certain situations. we MUST fall back on our normal loader.
+
+	s->decoder.buf = buf = Z_Malloc(sizeof(*buf)+128);
+	//fill with a placeholder
+	buf->length = 128;
+	buf->speed = snd_speed;
+	buf->format = QAF_S8; //something basic
+	buf->numchannels=1;
+	buf->soundoffset = 0;
+	buf->data = (qbyte*)(buf+1);
+
+	s->loopstart = 0; //keep looping silence until it actually loads something.
+
+	return emscriptenfte_pcm_loadaudiofile(s, S_BrowserDecoded, data, datalen, sndspeed);
+}
+#else
 //web browsers contain their own decoding libraries that our openal stuff can use.
 static qboolean QDECL S_LoadBrowserFile (sfx_t *s, qbyte *data, size_t datalen, int sndspeed, qboolean forcedecode)
 {
@@ -842,6 +883,9 @@ static qboolean QDECL S_LoadBrowserFile (sfx_t *s, qbyte *data, size_t datalen,
 	return true;
 }
 #endif
+#endif
+
+qboolean QDECL S_LoadOVSound (sfx_t *s, qbyte *data, size_t datalen, int sndspeed, qboolean forcedecode);
 
 //highest priority is last.
 static struct
diff --git a/engine/client/sound.h b/engine/client/sound.h
index ff6d07a0d..6269de988 100644
--- a/engine/client/sound.h
+++ b/engine/client/sound.h
@@ -242,12 +242,12 @@ void S_ResetFailedLoad(void);
 #ifdef PEXT2_VOICECHAT
 void S_Voip_Parse(void);
 #endif
+int S_Voip_ClientLoudness(unsigned int plno);
 #ifdef VOICECHAT
 extern cvar_t snd_voip_showmeter;
 void S_Voip_Transmit(unsigned char clc, sizebuf_t *buf);
 void S_Voip_MapChange(void);
 int S_Voip_Loudness(qboolean ignorevad);	//-1 for not capturing, otherwise between 0 and 100
-int S_Voip_ClientLoudness(unsigned int plno);
 qboolean S_Voip_Speaking(unsigned int plno);
 void S_Voip_Ignore(unsigned int plno, qboolean ignore);
 #else
diff --git a/engine/client/sys_linux.c b/engine/client/sys_linux.c
index bb800ae4c..e573da0e6 100644
--- a/engine/client/sys_linux.c
+++ b/engine/client/sys_linux.c
@@ -452,7 +452,7 @@ static void Sys_Register_File_Associations_f(void)
 		if (!strcmp(iconname, "afterquake") || !strcmp(iconname, "nq"))	//hacks so that we don't need to create icons.
 			iconname = "quake";
 
-		if (FS_NativePath("icon.png", FS_PUBBASEGAMEONLY, iconsyspath, sizeof(iconsyspath)))
+		if (FS_SystemPath("icon.png", FS_PUBBASEGAMEONLY, iconsyspath, sizeof(iconsyspath)))
 			iconname = iconsyspath;
 
 		s = va("%s/applications/fte-%s.desktop", xdgbase, fs_manifest->installation);
@@ -1215,7 +1215,7 @@ static void DoSign(const char *fname, int signtype)
 		searchpathfuncs_t *search = FS_OpenPackByExtension(f, NULL, fname, fname, prefix);
 		if (search)
 		{
-			printf("%#08x", search->GeneratePureCRC(search, 0, 0));
+			printf("%#08x", search->GeneratePureCRC(search, NULL));
 			search->ClosePath(search);
 		}
 		else
@@ -1551,15 +1551,6 @@ int main (int c, const char **v)
 
 	Host_Init(&parms);
 
-	for (i = 1; i < parms.argc; i++)
-	{
-		if (!parms.argv[i])
-			continue;
-		if (*parms.argv[i] == '+' || *parms.argv[i] == '-')
-			break;
-		Host_RunFile(parms.argv[i], strlen(parms.argv[i]), NULL);
-	}
-
 	oldtime = Sys_DoubleTime ();
 	while (1)
 	{
diff --git a/engine/client/sys_sdl.c b/engine/client/sys_sdl.c
index eda6a47c6..97832d338 100644
--- a/engine/client/sys_sdl.c
+++ b/engine/client/sys_sdl.c
@@ -948,7 +948,6 @@ int QDECL main(int argc, char **argv)
 {
 	float time, newtime, oldtime;
 	quakeparms_t	parms;
-	int i;
 
 	memset(&parms, 0, sizeof(parms));
 
@@ -975,15 +974,6 @@ int QDECL main(int argc, char **argv)
 
 	oldtime = Sys_DoubleTime ();
 
-	for (i = 1; i < parms.argc; i++)
-	{
-		if (!parms.argv[i])
-			continue;
-		if (*parms.argv[i] == '+' || *parms.argv[i] == '-')
-			break;
-		Host_RunFile(parms.argv[i], strlen(parms.argv[i]), NULL);
-	}
-
 //client console should now be initialized.
 
     /* main window message loop */
diff --git a/engine/client/sys_win.c b/engine/client/sys_win.c
index 30165e58a..6d0db97cb 100644
--- a/engine/client/sys_win.c
+++ b/engine/client/sys_win.c
@@ -3629,7 +3629,7 @@ static qboolean Sys_DoInstall(void)
 
 	GetModuleFileNameW(NULL, wide, countof(wide));
 	narrowen(exepath, sizeof(exepath), wide);
-	FS_NativePath(va("%s.exe", fs_gamename.string), FS_ROOT, newexepath, sizeof(newexepath));
+	FS_SystemPath(va("%s.exe", fs_gamename.string), FS_ROOT, newexepath, sizeof(newexepath));
 	CopyFileU(exepath, newexepath, FALSE);
 
 	/*the game can now be run (using regular autoupdate stuff), but most installers are expected to install the data instead of just more downloaders, so lets do that with a 'nice' progress box*/
@@ -4347,16 +4347,6 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 
 		oldtime = Sys_DoubleTime ();
 
-		if (qtvfile)
-		{
-			if (!Host_RunFile(qtvfile, strlen(qtvfile), NULL))
-			{
-				SetHookState(false);
-				Host_Shutdown ();
-				return EXIT_FAILURE;
-			}
-		}
-
 	//client console should now be initialized.
 
 		#ifndef MINGW
diff --git a/engine/client/valid.c b/engine/client/valid.c
index 6863340cf..883c32931 100644
--- a/engine/client/valid.c
+++ b/engine/client/valid.c
@@ -1437,6 +1437,9 @@ void Validation_Auto_Response(int playernum, char *s)
 	static float cmdlineresponsetime;
 	static float scriptsresponsetime;
 
+	if (cls.demoplayback)
+		return;	//noone gives a shit about qtv spectator versions that can't even play without reconnecting.
+
 	//quakeworld tends to use f_*
 	//netquake uses the slightly more guessable q_* form
 	if (!strncmp(s, "f_", 2))
diff --git a/engine/client/view.c b/engine/client/view.c
index 66b7e7ac6..0dba588e2 100644
--- a/engine/client/view.c
+++ b/engine/client/view.c
@@ -94,8 +94,8 @@ static cvar_t	v_ipitch_level			= CVAR("v_ipitch_level", "0.3");
 static cvar_t	v_idlescale				= CVARD("v_idlescale", "0", "Enable swishing of the view (whether idle or otherwise). Often used for concussion effects.");
 
 cvar_t	crosshair				= CVARF("crosshair", "1", CVAR_ARCHIVE);
-cvar_t	crosshaircolor			= CVARF("crosshaircolor", "255 255 255", CVAR_ARCHIVE);
-cvar_t	crosshairsize			= CVARF("crosshairsize", "8", CVAR_ARCHIVE);
+cvar_t	crosshaircolor			= CVARF("crosshaircolor", "255 255 255", CVAR_ARCHIVE); //QSSM misnamed it...
+cvar_t	crosshairsize			= CVARF("crosshairsize", "8", CVAR_ARCHIVE);	//QS has scr_crosshairscale, but its a multiplier rather than (vritual) size.
 
 cvar_t	cl_crossx				= CVARF("cl_crossx", "0", CVAR_ARCHIVE);
 cvar_t	cl_crossy				= CVARF("cl_crossy", "0", CVAR_ARCHIVE);
@@ -1877,7 +1877,7 @@ static void SCR_DrawAutoID(vec3_t org, player_info_t *pl, qboolean isteam)
 	x = center[0]*r_refdef.vrect.width+r_refdef.vrect.x;
 	y = (1-center[1])*r_refdef.vrect.height+r_refdef.vrect.y;
 
-	if (cls.demoplayback == DPB_MVD || cls.demoplayback == DPB_EZTV)
+	if (cls.demoplayback == DPB_MVD)
 	{
 		health = pl->statsf[STAT_HEALTH];
 		armour = pl->statsf[STAT_ARMOR];
@@ -2050,6 +2050,10 @@ void R_DrawNameTags(void)
 		vec3_t targ;
 		vec2_t scale = {12,12};
 		msurface_t *surf;
+		shader_t *shader;
+		const char *shadername;
+		char *body;
+		char fname[MAX_QPATH];
 		VectorMA(r_refdef.vieworg, 8192, vpn, targ);
 #ifdef CSQC_DAT
 		if (csqc_world.progs)
@@ -2063,23 +2067,53 @@ void R_DrawNameTags(void)
 #endif
 			cl.worldmodel->funcs.NativeTrace(cl.worldmodel, 0, PE_FRAMESTATE, NULL, r_refdef.vieworg, targ, vec3_origin, vec3_origin, false, ~0, &trace);
 
-		surf = (trace.fraction == 1)?NULL:Mod_GetSurfaceNearPoint(cl.worldmodel, trace.endpos);
-		if (surf)
+		if (trace.fraction >= 1)
+			str = "hit nothing";
+		else
 		{
-			shader_t *shader = surf->texinfo->texture->shader;
-			char fname[MAX_QPATH];
-			char *body = shader?Shader_GetShaderBody(shader, fname, countof(fname)):NULL;
+			shader = NULL;
+			if (cl.worldmodel->terrain && trace.brush_id && (shader = Terr_GetShader(cl.worldmodel, &trace)))
+				shadername = shader->name;
+			else if ((surf = (trace.fraction == 1)?NULL:Mod_GetSurfaceNearPoint(cl.worldmodel, trace.endpos)))
+			{
+				shadername = surf->texinfo->texture->name;
+				shader = surf->texinfo->texture->shader;
+			}
+			else if (trace.surface && *trace.surface->name)
+			{
+				shadername = trace.surface->name;
+				shader = NULL;
+			}
+			else
+			{
+				shadername = "the unknown";
+				shader = NULL;
+			}
+
+			body = shader?Shader_GetShaderBody(shader, fname, countof(fname)):NULL;
 			if (body)
 			{
-//				Q_snprintfz(fname, sizeof(fname), "<default shader>");
-				str = va("^2%s^7\n%s%s\n{%s\n", fname, ruleset_allow_shaders.ival?"":CON_ERROR"WARNING: ruleset_allow_shaders disables external shaders"CON_DEFAULT"\n", surf->texinfo->texture->name, body);
+				int width, height;
+				char *cr;
+				const char *fl = "";
+				if (shader->usageflags & SUF_LIGHTMAP)
+					fl = S_COLOR_GRAY" (lightmapped)"S_COLOR_WHITE;
+				else if (shader->usageflags & SUF_2D)
+					fl = S_COLOR_GRAY" (2d)"S_COLOR_WHITE;
+				else //if (shader->usageflags & SUF_2D)
+					fl = S_COLOR_GRAY" (auto)"S_COLOR_WHITE;
+				if (R_GetShaderSizes(shader, &width, &height, false)>0)
+					fl = va("%s (%ix%i)", fl, width, height);
+
+				while((cr = strchr(body, '\r')))
+					*cr = ' ';
+
+				str = va(S_COLOR_GREEN"%s"S_COLOR_WHITE"\n%s%s%s\n{%s\n", fname, ruleset_allow_shaders.ival?"":CON_ERROR"WARNING: ruleset_allow_shaders disables external shaders"CON_DEFAULT"\n", shadername, fl, body);
 				Z_Free(body);
 			}
 			else
-				str = va("hit '%s'", surf->texinfo->texture->name);
+				str = va("hit '%s'", shadername);
 		}
-		else
-			str = "hit nothing";
 		R_DrawTextField(r_refdef.vrect.x + r_refdef.vrect.width/4, r_refdef.vrect.y, r_refdef.vrect.width/2, r_refdef.vrect.height, str, CON_WHITEMASK, CPRINT_LALIGN, font_console, scale);
 	}
 	else
diff --git a/engine/client/vr.h b/engine/client/vr.h
index a0b6a5fd9..416e3c7cc 100644
--- a/engine/client/vr.h
+++ b/engine/client/vr.h
@@ -67,14 +67,17 @@ typedef struct vrsetup_s
 	};
 } vrsetup_t;
 
+#define VRF_OVERRIDEFRAMETIME	1	//the vr interface is responsible for determining frame intervals instead of using regular clocks (so they can fiddle with prediction etc)
+#define VRF_UIACTIVE			2	//we're actually rendering through a headset. use 3d rendering exclusively, with VR UI and stuff.
+
 //interface registered by plugins for VR stuff.
 typedef struct plugvrfuncs_s
 {
 	const char	*description;
 	qboolean	(*Prepare)	(vrsetup_t *setupinfo);	//called before graphics context init
 	qboolean	(*Init)		(vrsetup_t *setupinfo, rendererstate_t *info);	//called after graphics context init
-	qboolean	(*SyncFrame)(double *frametime);	//called in the client's main loop, to block/tweak frame times. True means the game should render as fast as possible.
-	qboolean	(*Render)	(void(*rendereye)(texid_t tex, vec4_t fovoverride, vec3_t angorg[2]));
+	unsigned int	(*SyncFrame)(double *frametime);	//called in the client's main loop, to block/tweak frame times. True means the game should render as fast as possible.
+	qboolean	(*Render)	(void(*rendereye)(texid_t tex, const pxrect_t *viewport, const vec4_t fovoverride, const float projmatrix[16], const float eyematrix[12]));
 	void		(*Shutdown)	(void);
 #define plugvrfuncs_name "VR"
 } plugvrfuncs_t;
diff --git a/engine/client/winquake.h b/engine/client/winquake.h
index ee95c06f6..bf83fae80 100644
--- a/engine/client/winquake.h
+++ b/engine/client/winquake.h
@@ -128,7 +128,8 @@ extern qboolean	mouseinitialized;
 //extern HANDLE	hinput, houtput;
 
 extern HCURSOR	hArrowCursor, hCustomCursor;
-void *WIN_CreateCursor(const qbyte *imagedata, int width, int height, uploadfmt_t format, float hotx, float hoty, float scale);
+enum uploadfmt;
+void *WIN_CreateCursor(const qbyte *imagedata, int width, int height, enum uploadfmt format, float hotx, float hoty, float scale);
 qboolean WIN_SetCursor(void *cursor);
 void WIN_DestroyCursor(void *cursor);
 void WIN_WindowCreated(HWND window);
diff --git a/engine/client/zqtp.c b/engine/client/zqtp.c
index ce7127201..5e638c3fd 100644
--- a/engine/client/zqtp.c
+++ b/engine/client/zqtp.c
@@ -76,92 +76,92 @@ static void QDECL TP_EnemyColor_CB (struct cvar_s *var, char *oldvalue);
 #define TP_SKIN_CVARS	\
 	TP_CVARAC(cl_teamskin,		"", teamskin, TP_SkinCvar_Callback);	\
 	TP_CVARAC(cl_enemyskin,		"", enemyskin, TP_SkinCvar_Callback);	\
-	TP_CVARC(enemycolor,		"off", TP_EnemyColor_CB);	\
-	TP_CVARC(teamcolor,			"off", TP_TeamColor_CB);
+	static TP_CVARC(enemycolor,		"off", TP_EnemyColor_CB);	\
+	static TP_CVARC(teamcolor,			"off", TP_TeamColor_CB);
 #else
 #define TP_SKIN_CVARS
 #endif
 
 #ifdef QUAKESTATS
 #define TP_NAME_CVARS	\
-	TP_CVAR(tp_name_none,		"");	\
-	TP_CVAR(tp_name_axe,		"axe");	\
-	TP_CVAR(tp_name_sg,			"sg");	\
-	TP_CVAR(tp_name_ssg,		"ssg");	\
-	TP_CVAR(tp_name_ng,			"ng");	\
-	TP_CVAR(tp_name_sng,		"sng");	\
-	TP_CVAR(tp_name_gl,			"gl");	\
-	TP_CVAR(tp_name_rl,			"rl");	\
-	TP_CVAR(tp_name_lg,			"lg");	\
-	TP_CVAR(tp_name_ra,			"ra");	\
-	TP_CVAR(tp_name_ya,			"ya");	\
-	TP_CVAR(tp_name_ga,			"ga");	\
-	TP_CVAR(tp_name_quad,		"quad");	\
-	TP_CVAR(tp_name_pent,		"pent");	\
-	TP_CVAR(tp_name_ring,		"ring");	\
-	TP_CVAR(tp_name_suit,		"suit");	\
-	TP_CVAR(tp_name_shells,		"shells");	\
-	TP_CVAR(tp_name_nails,		"nails");	\
-	TP_CVAR(tp_name_rockets,	"rockets");	\
-	TP_CVAR(tp_name_cells,		"cells");	\
-	TP_CVAR(tp_name_mh,			"mega");	\
-	TP_CVAR(tp_name_health,		"health");	\
-	TP_CVAR(tp_name_backpack,	"pack");	\
-	TP_CVAR(tp_name_flag,		"flag");	\
-	TP_CVAR(tp_name_nothing,	"nothing");	\
-	TP_CVAR(tp_name_at,			"at");	\
-	TP_CVAR(tp_need_ra,			"50");	\
-	TP_CVAR(tp_need_ya,			"50");	\
-	TP_CVAR(tp_need_ga,			"50");	\
-	TP_CVAR(tp_need_health,		"50");	\
-	TP_CVAR(tp_need_weapon,		"35687");	\
-	TP_CVAR(tp_need_rl,			"1");	\
-	TP_CVAR(tp_need_rockets,	"5");	\
-	TP_CVAR(tp_need_cells,		"20");	\
-	TP_CVAR(tp_need_nails,		"40");	\
-	TP_CVAR(tp_need_shells,		"10");	\
-	TP_CVAR(tp_name_disp,		"dispenser");	\
-	TP_CVAR(tp_name_sentry,		"sentry gun");	\
-	TP_CVAR(tp_name_rune_1,		"resistance rune");	\
-	TP_CVAR(tp_name_rune_2,		"strength rune");	\
-	TP_CVAR(tp_name_rune_3,		"haste rune");	\
-	TP_CVAR(tp_name_rune_4,		"regeneration rune");	\
+	static TP_CVAR(tp_name_none,			"");	\
+	static TP_CVAR(tp_name_axe,				"axe");	\
+	TP_CVAR(tp_name_sg,						"sg");	\
+	TP_CVAR(tp_name_ssg,					"ssg");	\
+	TP_CVAR(tp_name_ng,						"ng");	\
+	TP_CVAR(tp_name_sng,					"sng");	\
+	TP_CVAR(tp_name_gl,						"gl");	\
+	TP_CVAR(tp_name_rl,						"rl");	\
+	TP_CVAR(tp_name_lg,						"lg");	\
+	static TP_CVAR(tp_name_ra,				"ra");	\
+	static TP_CVAR(tp_name_ya,				"ya");	\
+	static TP_CVAR(tp_name_ga,				"ga");	\
+	static TP_CVAR(tp_name_quad,			"quad");	\
+	static TP_CVAR(tp_name_pent,			"pent");	\
+	static TP_CVAR(tp_name_ring,			"ring");	\
+	static TP_CVAR(tp_name_suit,			"suit");	\
+	static TP_CVAR(tp_name_shells,			"shells");	\
+	static TP_CVAR(tp_name_nails,			"nails");	\
+	static TP_CVAR(tp_name_rockets,			"rockets");	\
+	static TP_CVAR(tp_name_cells,			"cells");	\
+	static TP_CVAR(tp_name_mh,				"mega");	\
+	static TP_CVAR(tp_name_health,			"health");	\
+	static TP_CVAR(tp_name_backpack,		"pack");	\
+	static TP_CVAR(tp_name_flag,			"flag");	\
+	static TP_CVAR(tp_name_nothing,			"nothing");	\
+	static TP_CVAR(tp_name_at,				"at");	\
+	static TP_CVAR(tp_need_ra,				"50");	\
+	static TP_CVAR(tp_need_ya,				"50");	\
+	static TP_CVAR(tp_need_ga,				"50");	\
+	static TP_CVAR(tp_need_health,			"50");	\
+	static TP_CVAR(tp_need_weapon,			"35687");	\
+	static TP_CVAR(tp_need_rl,				"1");	\
+	static TP_CVAR(tp_need_rockets,			"5");	\
+	static TP_CVAR(tp_need_cells,			"20");	\
+	static TP_CVAR(tp_need_nails,			"40");	\
+	static TP_CVAR(tp_need_shells,			"10");	\
+	static TP_CVAR(tp_name_disp,			"dispenser");	\
+	static TP_CVAR(tp_name_sentry,			"sentry gun");	\
+	static TP_CVAR(tp_name_rune_1,			"resistance rune");	\
+	static TP_CVAR(tp_name_rune_2,			"strength rune");	\
+	static TP_CVAR(tp_name_rune_3,			"haste rune");	\
+	static TP_CVAR(tp_name_rune_4,			"regeneration rune");	\
 	\
-	TP_CVAR(tp_name_status_red,		"$R");	\
-	TP_CVAR(tp_name_status_green,	"$G");	\
-	TP_CVAR(tp_name_status_yellow,	"$Y");	\
-	TP_CVAR(tp_name_status_blue,	"$B");	\
+	static TP_CVAR(tp_name_status_red,		"$R");	\
+	static TP_CVAR(tp_name_status_green,	"$G");	\
+	static TP_CVAR(tp_name_status_yellow,	"$Y");	\
+	static TP_CVAR(tp_name_status_blue,		"$B");	\
 	\
-	TP_CVAR(tp_name_armortype_ga,	"g");	\
-	TP_CVAR(tp_name_armortype_ya,	"y");	\
-	TP_CVAR(tp_name_armortype_ra,	"r");	\
-	TP_CVAR(tp_name_armor,			"armor");	\
-	TP_CVAR(tp_name_weapon,			"weapon");	\
-	TP_CVAR(tp_weapon_order,		"78654321");	\
+	static TP_CVAR(tp_name_armortype_ga,	"g");	\
+	static TP_CVAR(tp_name_armortype_ya,	"y");	\
+	static TP_CVAR(tp_name_armortype_ra,	"r");	\
+	static TP_CVAR(tp_name_armor,			"armor");	\
+	static TP_CVAR(tp_name_weapon,			"weapon");	\
+	static TP_CVAR(tp_weapon_order,			"78654321");	\
 	\
-  	TP_CVAR(tp_name_quaded,			"quaded");	\
-	TP_CVAR(tp_name_pented,			"pented");	\
-	TP_CVAR(tp_name_separator,		"/");	\
+  	static TP_CVAR(tp_name_quaded,			"quaded");	\
+	static TP_CVAR(tp_name_pented,			"pented");	\
+	static TP_CVAR(tp_name_separator,		"/");	\
 	\
-	TP_CVAR(tp_name_enemy,			"enemy");	\
-	TP_CVAR(tp_name_teammate,		"");	\
-	TP_CVAR(tp_name_eyes,			"eyes");	\
+	static TP_CVAR(tp_name_enemy,			"enemy");	\
+	static TP_CVAR(tp_name_teammate,		"");	\
+	static TP_CVAR(tp_name_eyes,			"eyes");	\
 	\
-	TP_CVAR(loc_name_separator,		"-");	\
-	TP_CVAR(loc_name_ssg,		"ssg");	\
-	TP_CVAR(loc_name_ng,		"ng");	\
-	TP_CVAR(loc_name_sng,		"sng");	\
-	TP_CVAR(loc_name_gl,		"gl");	\
-	TP_CVAR(loc_name_rl,		"rl");	\
-	TP_CVAR(loc_name_lg,		"lg");	\
-	TP_CVAR(loc_name_ga,		"ga");	\
-	TP_CVAR(loc_name_ya,		"ya");	\
-	TP_CVAR(loc_name_ra,		"ra");	\
-	TP_CVAR(loc_name_mh,		"mh");	\
-	TP_CVAR(loc_name_quad,		"quad");	\
-	TP_CVAR(loc_name_pent,		"pent");	\
-	TP_CVAR(loc_name_ring,		"ring");	\
-	TP_CVAR(loc_name_suit,		"suit");
+	static TP_CVAR(loc_name_separator,		"-");	\
+	static TP_CVAR(loc_name_ssg,			"ssg");	\
+	static TP_CVAR(loc_name_ng,				"ng");	\
+	static TP_CVAR(loc_name_sng,			"sng");	\
+	static TP_CVAR(loc_name_gl,				"gl");	\
+	static TP_CVAR(loc_name_rl,				"rl");	\
+	static TP_CVAR(loc_name_lg,				"lg");	\
+	static TP_CVAR(loc_name_ga,				"ga");	\
+	static TP_CVAR(loc_name_ya,				"ya");	\
+	static TP_CVAR(loc_name_ra,				"ra");	\
+	static TP_CVAR(loc_name_mh,				"mh");	\
+	static TP_CVAR(loc_name_quad,			"quad");	\
+	static TP_CVAR(loc_name_pent,			"pent");	\
+	static TP_CVAR(loc_name_ring,			"ring");	\
+	static TP_CVAR(loc_name_suit,			"suit");
 #else
 	#define TP_NAME_CVARS
 #endif
@@ -171,16 +171,16 @@ static void QDECL TP_EnemyColor_CB (struct cvar_s *var, char *oldvalue);
 #define TP_CVARS \
 	TP_SKIN_CVARS \
 	TP_NAME_CVARS \
-	TP_CVAR(cl_fakename,		"");	\
+	static TP_CVAR(cl_fakename,		"");	\
 	TP_CVAR(cl_parseSay,		"1");	\
 	TP_CVAR(cl_parseFunChars,		"1");	\
 	TP_CVAR(cl_triggers,		"1");	\
-	TP_CVAR(tp_autostatus,		"");	/* things which will not always change, but are useful */ \
+	static TP_CVAR(tp_autostatus,		"");	/* things which will not always change, but are useful */ \
 	TP_CVAR(tp_forceTriggers,		"0");	\
 	TP_CVAR(tp_loadlocs,		"1");	\
-	TP_CVAR(tp_soundtrigger,		"~");	\
+	static TP_CVAR(tp_soundtrigger,		"~");	\
 	\
-	TP_CVAR(tp_name_someplace,	"someplace")
+	static TP_CVAR(tp_name_someplace,	"someplace")
 
 //create the globals for all the TP cvars.
 #define TP_CVAR(name,def) cvar_t	name = CVAR(#name, def)
@@ -906,10 +906,6 @@ static char *Macro_demoplayback (void)
 	case DPB_QUAKE2:
 		return "dm2playback";
 #endif
-
-	//gcc will warn if we add annother playback and forget here, otherwise I'd use a default.
-	case DPB_EZTV:
-		break;
 	}
 	return "1";	//unknown.
 }
@@ -2311,9 +2307,9 @@ int TP_CategorizeMessage (char *s, int *offset, player_info_t **plr)
 				// no team messages in teamplay 0, except for our own
 				if (pv->spectator)
 				{
-					unsigned int track = Cam_TrackNum(pv);
-					if (i == track || ( cl.teamplay &&
-						!strcmp(cl.players[track].team, player->team)) )
+					int track = Cam_TrackNum(pv);
+					if (track>=0 && (i == track || ( cl.teamplay &&
+						!strcmp(cl.players[track].team, player->team)) ))
 					{
 						flags |= TPM_OBSERVEDTEAM;
 					}
@@ -3710,7 +3706,9 @@ void TP_Init (void)
 #define TP_CVAR(name,def) Cvar_Register (&name,	TEAMPLAYVARS);
 #define TP_CVARC(name,def,callback) Cvar_Register (&name, TEAMPLAYVARS);
 #define TP_CVARAC(name,def,name2,callback) Cvar_Register (&name, TEAMPLAYVARS);
+#define static
 	TP_CVARS;
+#undef static
 #undef TP_CVAR
 #undef TP_CVARC
 #undef TP_CVARAC
diff --git a/engine/common/bothdefs.h b/engine/common/bothdefs.h
index e6638101e..39b388a46 100644
--- a/engine/common/bothdefs.h
+++ b/engine/common/bothdefs.h
@@ -173,10 +173,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#define DISTRIBUTIONLONG "Forethought Entertainment"	//effectively the 'company' name
 #endif
 #ifndef FULLENGINENAME
-	#define FULLENGINENAME "FTE Quake"	//the posh name for the engine
+	#define FULLENGINENAME "FTE QW"	//the posh name for the engine, note that 'Quake' is trademarked so we should not be using it here.
 #endif
 #ifndef ENGINEWEBSITE
-	#define ENGINEWEBSITE "^8http://^4fte^8.^4triptohell^8.^4info"	//url for program
+	#define ENGINEWEBSITE "^8https://^4fte^8.^4triptohell^8.^4info"	//url for program
 #endif
 
 #if !defined(_WIN32) || defined(WINRT)
@@ -187,9 +187,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#undef AVAIL_WASAPI
 #endif
 
-#if !(defined(__linux__) || defined(__CYGWIN__)) || defined(ANDROID)
-	#undef HAVE_GNUTLS
-#endif
+//#if !(defined(__linux__) || defined(__CYGWIN__)) || defined(ANDROID)
+//	#undef HAVE_GNUTLS
+//#endif
 #if !defined(_WIN32) || (defined(_MSC_VER) && (_MSC_VER < 1300)) || defined(FTE_SDL)
 	#undef HAVE_WINSSPI
 #endif
@@ -253,7 +253,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#undef Q2BSPS
 	#undef Q3BSPS
 	#undef RFBSPS
-	#undef WEBSERVER		//http server
 	#undef FTPSERVER		//ftp server
 	#undef WEBCLIENT		//http client.
 	#undef FTPCLIENT		//ftp client.
@@ -285,7 +284,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#undef HAVE_PACKET	//no udp support
 
 	//try to trim the fat
-	#undef VOICECHAT	//too lazy to compile opus
+//	#undef VOICECHAT	//too lazy to compile opus
 	#undef HLCLIENT		//dlls...
 	#undef HLSERVER		//dlls...
 //	#undef CL_MASTER	//bah. use the site to specify the servers.
@@ -293,7 +292,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#undef RAGDOLL		//no ode
 	#undef TCPCONNECT	//err...
 	#undef IRCCONNECT	//not happening
-	#undef PLUGINS		//pointless
+	#if !defined(USE_INTERNAL_BULLET) && !defined(USE_INTERNAL_ODE) && !defined(MODELFMT_GLTF) && !defined(STATIC_EZHUD) && !defined(STATIC_OPENSSL) && !defined(STATIC_Q3)
+		#undef PLUGINS		//pointless
+	#endif
 	#undef VM_Q1		//no dlls
 	#undef MAP_PROC		//meh
 //	#undef HALFLIFEMODELS	//blurgh
@@ -392,15 +393,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifdef NO_GNUTLS
 	#undef HAVE_GNUTLS
 #endif
+#ifdef NO_WINSSPI
+	#undef HAVE_WINSSPI
+#endif
 #ifdef NO_OPENGL
 	#undef GLQUAKE
 	#undef USE_EGL
 #endif
 
-#if defined(HAVE_GNUTLS) || defined(HAVE_WINSSPI) || defined(HAVE_PLUGINS)
+#if (defined(HAVE_GNUTLS) || defined(HAVE_WINSSPI) || defined(PLUGINS)) && !defined(FTE_TARGET_WEB)
 	#define HAVE_SSL
 #endif
-#if defined(HAVE_GNUTLS) || defined(HAVE_WINSSPI) || defined(HAVE_PLUGINS)
+#if (defined(HAVE_GNUTLS) || defined(HAVE_WINSSPI) || defined(PLUGINS)) && !defined(FTE_TARGET_WEB)
 	//FIXME: HAVE_WINSSPI does not work as a server.
 	//FIXME: advertising dtls without a valid certificate will probably bug out if a client tries to auto-upgrade.
 	//FIXME: we don't cache server certs
@@ -456,7 +460,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef HAVE_TCP
 	#undef TCPCONNECT
 	#undef IRCCONNECT
-	#undef WEBSERVER		//http server
 	#undef FTPSERVER		//ftp server
 	#undef FTPCLIENT		//ftp client.
 	#if !defined(FTE_TARGET_WEB)
@@ -488,7 +491,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#undef Q2SERVER
 	#undef Q3SERVER
 	#undef HLSERVER
-	#undef WEBSERVER
 	#undef FTPSERVER
 	#undef SUBSERVERS
 	#undef VM_Q1
@@ -558,6 +560,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #else
 	#define IFMINIMAL(x,y) y
 #endif
+#ifdef FTE_TARGET_WEB
+	#define IFWEB(x,y) x
+#else
+	#define IFWEB(x,y) y
+#endif
 
 // defs common to client and server
 
@@ -902,8 +909,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define	MAX_NET_LIGHTSTYLES		(INVALID_LIGHTSTYLE+1)		// 16bit. the last index MAY be used to signify an invalid lightmap in the bsp, but is still valid for rtlights.
 #define MAX_STANDARDLIGHTSTYLES 64
-#define	MAX_PRECACHE_MODELS		4096		// 14bit.
-#define	MAX_PRECACHE_SOUNDS		2048		// 14bit.
+#define	MAX_PRECACHE_MODELS		16384		// 14bit.
+#define	MAX_PRECACHE_SOUNDS		4096		// 14bit.
 #define MAX_SSPARTICLESPRE 1024				// 14bit. precached particle effect names, for server-side pointparticles/trailparticles.
 #define MAX_VWEP_MODELS 32
 
diff --git a/engine/common/bspfile.h b/engine/common/bspfile.h
index fd44af050..3886d2971 100644
--- a/engine/common/bspfile.h
+++ b/engine/common/bspfile.h
@@ -177,19 +177,19 @@ enum q1contents_e
 	Q1CONTENTS_SLIME		= -4,
 	Q1CONTENTS_LAVA			= -5,
 	Q1CONTENTS_SKY			= -6,
-//#define Q1CONTENTS_ORIGIN	  -7	/*not known to engine - origin or something*/
-	Q1CONTENTS_CLIP			= -8,	/*solid to players+monsters, but not tracelines*/
-	Q1CONTENTS_CURRENT_0	= -9,	/*moves player*/
-	Q1CONTENTS_CURRENT_90	= -10,	/*moves player*/
-	Q1CONTENTS_CURRENT_180	= -11,	/*moves player*/
-	Q1CONTENTS_CURRENT_270	= -12,	/*moves player*/
-	Q1CONTENTS_CURRENT_UP	= -13,	/*moves player*/
-	Q1CONTENTS_CURRENT_DOWN	= -14,	/*moves player*/
-	Q1CONTENTS_TRANS		= -15,	/*should be solid I guess*/
+//#define HLCONTENTS_ORIGIN	  -7	/*not known to engine - origin or something*/
+	HLCONTENTS_CLIP			= -8,	/*solid to players+monsters, but not tracelines*/
+	HLCONTENTS_CURRENT_0	= -9,	/*moves player*/
+	HLCONTENTS_CURRENT_90	= -10,	/*moves player*/
+	HLCONTENTS_CURRENT_180	= -11,	/*moves player*/
+	HLCONTENTS_CURRENT_270	= -12,	/*moves player*/
+	HLCONTENTS_CURRENT_UP	= -13,	/*moves player*/
+	HLCONTENTS_CURRENT_DOWN	= -14,	/*moves player*/
+	HLCONTENTS_TRANS		= -15,	/*empty, but blocks pvs (for opaque non-solid windows, like vanilla-q1 water)*/
 	Q1CONTENTS_LADDER		= -16,	/*player can climb up/down*/
 	Q1CONTENTS_MONSTERCLIP	= -17,	/*solid to monster movement*/
 	Q1CONTENTS_PLAYERCLIP	= -18,	/*solid to player movement*/
-	Q1CONTENTS_CORPSE		= -19,	/*solid to tracelines*/
+	Q1CONTENTS_CORPSE		= -19,	/*solid to tracelines but not boxes*/
 };
 
 // !!! if this is changed, it must be changed in asm_i386.h too !!!
@@ -572,7 +572,7 @@ typedef struct
 #define	Q2CONTENTS_ORIGIN								  0x01000000	// removed before bsping an entity
 #define	Q2CONTENTS_MONSTER		FTECONTENTS_BODY		//0x02000000	// should never be on a brush, only in game
 #define	Q2CONTENTS_DEADMONSTER	FTECONTENTS_CORPSE		//0x04000000
-#define	Q2CONTENTS_DETAIL								  0x08000000	// brushes to be added after vis leafs
+#define	Q2CONTENTS_DETAIL		FTECONTENTS_DETAIL		// 0x08000000	// brushes to be added after vis leafs
 #define	Q2CONTENTS_TRANSLUCENT							  0x10000000	// auto set if any surface has trans
 #define	Q2CONTENTS_LADDER								  0x20000000
 														//0x40000000
@@ -606,7 +606,7 @@ typedef struct
 #define	Q3CONTENTS_ORIGIN		Q2CONTENTS_ORIGIN		//0x01000000
 #define	Q3CONTENTS_BODY			FTECONTENTS_BODY		//0x02000000
 #define	Q3CONTENTS_CORPSE		FTECONTENTS_CORPSE		//0x04000000
-#define	Q3CONTENTS_DETAIL		Q2CONTENTS_DETAIL		//0x08000000
+#define	Q3CONTENTS_DETAIL		FTECONTENTS_DETAIL		//0x08000000
 #define	Q3CONTENTS_STRUCTURAL							  0x10000000
 #define Q3CONTENTS_TRANSLUCENT							  0x20000000
 #define	Q3CONTENTS_TRIGGER								  0x40000000
@@ -649,11 +649,11 @@ typedef struct
 //#define TI_KINGPIN_WNDW33		0x4000
 //#define TI_KINGPIN_WNDW64		0x8000
 
-#define TI_Q2EX_ALPHATEST	(1u<<25)
-#define TI_N64_UV			(1u<<28)
-#define TI_N64_SCROLL_X		(1u<<29)
-#define TI_N64_SCROLL_Y		(1u<<30)
-#define TI_N64_SCROLL_FLIP	(1u<<31)
+#define TI_Q2EX_ALPHATEST	(1u<<25)	//seems to be a thing in other pre q2e engines too.
+#define TI_N64_UV			(1u<<28)	//2 qu per texel instead of 1... (still 16qu per luxel)
+#define TI_N64_SCROLL_X		(1u<<29)	//scrolls fully right each second.
+#define TI_N64_SCROLL_Y		(1u<<30)	//scrolls fully down each second.
+#define TI_N64_SCROLL_FLIP	(1u<<31)	//reverses the scroll dirs.
 
 //Surface flags
 //#define Q3SURFACEFLAG_NODAMAGE	0x1		// never give falling damage
diff --git a/engine/common/cmd.c b/engine/common/cmd.c
index ba140d0b0..cf22c1784 100644
--- a/engine/common/cmd.c
+++ b/engine/common/cmd.c
@@ -36,6 +36,7 @@ static const cvar_t dpcompat_console = {0};
 int	Cmd_ExecLevel;
 qboolean cmd_didwait;
 qboolean cmd_blockwait;
+static qboolean cmd_stuffedcmdline;
 
 void Cmd_ForwardToServer (void);
 
@@ -590,68 +591,67 @@ quake -nosound +cmd amlev1
 */
 void Cmd_StuffCmds (void)
 {
-	int		i, j;
+	int		i;
 	int		s;
-	char	*text, *build, c;
+	char	*text;
+	const char	*arg;
+	int		pluscmd = false;
 
+	if (cmd_stuffedcmdline)
+		return;	//don't do it multiple times
 
 // build the combined string to parse from
-	s = 0;
+	s = 2;
 	for (i=1 ; i<com_argc ; i++)
 	{
 		if (!com_argv[i])
 			continue;		// NEXTSTEP nulls out -NXHost
-		s += Q_strlen (com_argv[i]) + 3;
+		s += Q_strlen (com_argv[i])*2 + 4;
 	}
 	if (!s)
 		return;
 
-	text = (char*)Z_Malloc (s+1);
+	text = (char*)Z_Malloc (s+2);
 	text[0] = 0;
 	for (i=1 ; i<com_argc ; i++)
 	{
 		if (!com_argv[i])
 			continue;		// NEXTSTEP nulls out -NXHost
-		if (strchr(com_argv[i], ' ') || strchr(com_argv[i], '\t') || strchr(com_argv[i], '@') || strchr(com_argv[i], '/') || strchr(com_argv[i], '\\'))
+		arg = com_argv[i];
+		if ((*arg == '+' || *arg == '-') && !(arg[1] >= '0' && arg[1] <= '9'))	//we only really want the '+foo arg' commands, split by +/- prefixes. if its a -1 or +1 then that's a numerical parameter, not a separate command!
 		{
-			Q_strcat (text,"\"");
-			Q_strcat (text,com_argv[i]);
-			Q_strcat (text,"\"");
+			if (*text)
+			{
+				Q_strcat (text, "\n");
+				Cbuf_AddText (text, RESTRICT_LOCAL);
+				*text = 0;
+			}
+			pluscmd = *arg++ == '+';
+		}
+
+		if (pluscmd)
+		{
+			if (*text)
+				Q_strcat (text, " ");
+			if (strchr(arg, ' ') || strchr(arg, '\t') || strchr(arg, '@') || strchr(arg, '/') || strchr(arg, '\\'))
+				COM_QuotedString(arg, text+strlen(text),s-strlen(text), false);
+			else
+				Q_strcat (text,arg);
 		}
-		else
-			Q_strcat (text,com_argv[i]);
-		if (i != com_argc-1)
-			Q_strcat (text, " ");
 	}
 
-// pull out the commands
-	build = (char*)Z_Malloc (s+1);
-	build[0] = 0;
-
-	for (i=0 ; i<s-1 ; i++)
+	if (*text)
 	{
-		if (text[i] == '+')
-		{
-			i++;
-
-			for (j=i ; ((text[j-1] != ' ') || ((text[j] != '+') && (text[j] != '-'))) && (text[j] != 0) ; j++)
-				;
-
-			c = text[j];
-			text[j] = 0;
-
-			Q_strcat (build, text+i);
-			Q_strcat (build, "\n");
-			text[j] = c;
-			i = j-1;
-		}
+		Q_strcat (text, "\n");
+		Cbuf_AddText (text, RESTRICT_LOCAL);
 	}
 
-	if (build[0])
-		Cbuf_AddText (build, RESTRICT_LOCAL);
-
 	Z_Free (text);
-	Z_Free (build);
+
+	cmd_stuffedcmdline = true;	//don't add multiple times.
+
+	//and exec anything added.
+	Cbuf_Execute ();
 }
 
 #if defined(HAVE_LEGACY) && defined(HAVE_CLIENT)
@@ -784,8 +784,8 @@ static void Cmd_Exec_f (void)
 						char fulldefault[MAX_OSPATH];
 						char fullconfig[MAX_OSPATH];
 						*fulldefault = *fullconfig = 0;
-						FS_NativePath("default.cfg", FS_GAME, fulldefault, sizeof(fulldefault));
-						FS_NativePath(name, FS_GAME, fullconfig, sizeof(fullconfig));
+						FS_DisplayPath("default.cfg", FS_GAME, fulldefault, sizeof(fulldefault));
+						FS_DisplayPath(name, FS_GAME, fullconfig, sizeof(fullconfig));
 						Con_Printf("Refusing to execute \"%s\", superceded by %s\n", fullconfig, fulldefault);
 					}
 					return;
@@ -802,8 +802,8 @@ static void Cmd_Exec_f (void)
 						char fulldefault[MAX_OSPATH];
 						char fullconfig[MAX_OSPATH];
 						*fulldefault = *fullconfig = 0;
-						FS_NativePath("default.cfg", FS_GAME, fulldefault, sizeof(fulldefault));
-						FS_NativePath(name, FS_GAME, fullconfig, sizeof(fullconfig));
+						FS_DisplayPath("default.cfg", FS_GAME, fulldefault, sizeof(fulldefault));
+						FS_DisplayPath(name, FS_GAME, fullconfig, sizeof(fullconfig));
 						Con_Printf("Refusing to execute \"%s\", superceded by %s\n", fullconfig, fulldefault);
 					}
 					return;
@@ -4137,7 +4137,7 @@ static void Cmd_WriteConfig_f(void)
 	vfsfile_t *f;
 	char *filename;
 	char fname[MAX_QPATH];
-	char sysname[MAX_OSPATH];
+	char displayname[MAX_OSPATH];
 	qboolean all = true;
 
 	//special variation that only saves if an archived cvar was actually modified.
@@ -4154,7 +4154,7 @@ static void Cmd_WriteConfig_f(void)
 		MasterInfo_WriteServers();
 #endif
 
-		f = FS_OpenWithFriends(fname, sysname, sizeof(sysname), 4, "quake.rc", "hexen.rc", "*.cfg", "configs/*.cfg", "dlcache/*.pk3*");
+		f = FS_OpenWithFriends(fname, displayname, sizeof(displayname), 4, "quake.rc", "hexen.rc", "*.cfg", "configs/*.cfg", "dlcache/*.pk3*");
 
 		all = cfg_save_all.ival;
 	}
@@ -4170,7 +4170,7 @@ static void Cmd_WriteConfig_f(void)
 			return;
 		}
 
-		FS_NativePath(fname, FS_BASEGAMEONLY, sysname, sizeof(sysname));
+		FS_DisplayPath(fname, FS_BASEGAMEONLY, displayname, sizeof(displayname));
 		FS_CreatePath(fname, FS_BASEGAMEONLY);
 		f = FS_OpenVFS(fname, "wbp", FS_BASEGAMEONLY);
 
@@ -4192,7 +4192,7 @@ static void Cmd_WriteConfig_f(void)
 		Q_snprintfz(fname, sizeof(fname), "configs/%s", filename);
 		COM_DefaultExtension(fname, ".cfg", sizeof(fname));
 
-		FS_NativePath(fname, FS_BASEGAMEONLY, sysname, sizeof(sysname));
+		FS_DisplayPath(fname, FS_BASEGAMEONLY, displayname, sizeof(displayname));
 		FS_CreatePath(fname, FS_BASEGAMEONLY);
 		f = FS_OpenVFS(fname, "wbp", FS_BASEGAMEONLY);
 
@@ -4200,7 +4200,7 @@ static void Cmd_WriteConfig_f(void)
 	}
 	if (!f)
 	{
-		Con_Printf (CON_ERROR "Couldn't write config %s\n", sysname);
+		Con_Printf (CON_ERROR "Couldn't write config %s\n", displayname);
 		return;
 	}
 
@@ -4237,7 +4237,7 @@ static void Cmd_WriteConfig_f(void)
 
 	Cvar_Saved();
 
-	Con_Printf ("Wrote %s\n",sysname);
+	Con_Printf ("Wrote %s\n",displayname);
 }
 
 static void Cmd_Reset_f(void)
@@ -4426,6 +4426,7 @@ Cmd_Init
 */
 void Cmd_Init (void)
 {
+	cmd_stuffedcmdline = false;
 	macro_count = 0;	
 //
 // register our commands
diff --git a/engine/common/com_mesh.c b/engine/common/com_mesh.c
index 50cf69c2e..8ef42de23 100644
--- a/engine/common/com_mesh.c
+++ b/engine/common/com_mesh.c
@@ -85,7 +85,7 @@ qboolean Mod_DoCRC(model_t *mod, char *buffer, int buffersize)
 
 extern cvar_t gl_part_flame, r_fullbrightSkins, r_fb_models;
 extern cvar_t r_noaliasshadows;
-extern cvar_t r_skin_overlays;
+//extern cvar_t r_skin_overlays;
 extern cvar_t mod_md3flags;
 
 
@@ -1020,7 +1020,7 @@ typedef struct
 	float		*pose[FRAME_BLENDS*2];	//pointer to the raw frame data for bone 0.
 	void		*needsfree[FRAME_BLENDS*2];
 } skellerps_t;
-static qboolean Alias_BuildSkelLerps(skellerps_t *lerps, const struct framestateregion_s *fs, int numbones, const galiasinfo_t *inf)
+static qboolean Alias_BuildSkelLerps(skellerps_t *lerps, const struct framestateregion_s *fs, const galiasbone_t *boneinf, int numbones, const galiasinfo_t *inf)
 {
 	int frame1;	//signed, because frametime might be negative...
 	int frame2;
@@ -1066,7 +1066,7 @@ static qboolean Alias_BuildSkelLerps(skellerps_t *lerps, const struct framestate
 			{
 				lerps->frac[l] = fs->lerpweight[b];
 				lerps->needsfree[l] = BZ_Malloc(sizeof(float)*12*numbones);
-				lerps->pose[l] = g->GetRawBones(inf, g, time, lerps->needsfree[l], numbones);
+				lerps->pose[l] = g->GetRawBones(inf, g, time, lerps->needsfree[l], boneinf, numbones);
 				if (lerps->pose[l])
 					l++;
 				else
@@ -1107,14 +1107,14 @@ static qboolean Alias_BuildSkelLerps(skellerps_t *lerps, const struct framestate
 			{
 				totalweight += lerps->frac[l];
 				lerps->needsfree[l] = NULL;
-				lerps->pose[l++] = (float*)g->boneofs + numbones*12*frame1;
+				lerps->pose[l++] = (float*)g->boneofs + inf->numbones*12*frame1;
 			}
 			lerps->frac[l] = (mlerp)*fs->lerpweight[b];
 			if (lerps->frac[l]>0)
 			{
 				totalweight += lerps->frac[l];
 				lerps->needsfree[l] = NULL;
-				lerps->pose[l++] = (float*)g->boneofs + numbones*12*frame2;
+				lerps->pose[l++] = (float*)g->boneofs + inf->numbones*12*frame2;
 			}
 		}
 	}
@@ -1153,16 +1153,13 @@ static qboolean Alias_BuildSkelLerps(skellerps_t *lerps, const struct framestate
 /*
 finds the various blend info. returns number of bone blocks used.
 */
-static int Alias_FindRawSkelData(galiasinfo_t *inf, const framestate_t *fstate, skellerps_t *lerps, size_t firstbone, size_t lastbone)
+static int Alias_FindRawSkelData(galiasinfo_t *inf, const framestate_t *fstate, skellerps_t *lerps, size_t firstbone, size_t lastbone, const galiasbone_t *boneinfo)
 {
 	int bonegroup;
 	int cbone = 0;
 	int endbone;
 	int numbonegroups=0;
 
-	if (lastbone > inf->numbones)
-		lastbone = inf->numbones;
-
 	for (bonegroup = 0; bonegroup < FS_COUNT; bonegroup++)
 	{
 		endbone = fstate->g[bonegroup].endbone;
@@ -1176,7 +1173,7 @@ static int Alias_FindRawSkelData(galiasinfo_t *inf, const framestate_t *fstate,
 			if (lerps->firstbone == lerps->endbone)
 				continue;
 
-			if (!inf->numanimations || !Alias_BuildSkelLerps(lerps, &fstate->g[bonegroup], inf->numbones, inf))	//if there's no animations in this model, use the base pose instead.
+			if (!inf->numanimations || !Alias_BuildSkelLerps(lerps, &fstate->g[bonegroup], boneinfo, lerps->endbone, inf))	//if there's no animations in this model, use the base pose instead.
 			{
 				if (!inf->baseframeofs)
 					continue;	//nope, not happening.
@@ -1200,11 +1197,11 @@ static int Alias_FindRawSkelData(galiasinfo_t *inf, const framestate_t *fstate,
 	return value is the lastbone argument, or less if the model simply doesn't have that many bones.
 	_always_ writes into result
 */
-static int Alias_BlendBoneData(galiasinfo_t *inf, framestate_t *fstate, float *result, skeltype_t skeltype, int firstbone, int lastbone)
+static int Alias_BlendBoneData(galiasinfo_t *inf, const framestate_t *fstate, float *result, skeltype_t skeltype, int firstbone, int lastbone, const galiasbone_t *boneinfo)
 {
 	skellerps_t lerps[FS_COUNT], *lerp;
 	size_t bone, endbone = 0;
-	size_t numgroups = Alias_FindRawSkelData(inf, fstate, lerps, firstbone, lastbone);
+	size_t numgroups = Alias_FindRawSkelData(inf, fstate, lerps, firstbone, lastbone, boneinfo);
 
 	float *pose, *matrix;
 	int k, b;
@@ -1219,7 +1216,7 @@ static int Alias_BlendBoneData(galiasinfo_t *inf, framestate_t *fstate, float *r
 				memcpy(result+bone*12, lerp->pose[0]+bone*12, (endbone-bone)*12*sizeof(float));
 			else
 			{
-				//set up the identity matrix
+				//blend each influence
 				for (; bone < endbone; bone++)
 				{
 					pose = result + 12*bone;
@@ -1247,7 +1244,7 @@ static int Alias_BlendBoneData(galiasinfo_t *inf, framestate_t *fstate, float *r
 only writes targetbuffer if needed. the return value is the only real buffer result.
 assumes that all blended types are the same. probably buggy, but meh.
 */
-static const float *Alias_GetBoneInformation(galiasinfo_t *inf, const framestate_t *framestate, skeltype_t targettype, float *targetbuffer, float *targetbufferalt, size_t maxbufferbones)
+static const float *Alias_GetBoneInformation(galiasinfo_t *inf, const framestate_t *framestate, skeltype_t targettype, float *targetbuffer, float *targetbufferalt, size_t numbones, const galiasbone_t *boneinfo)
 {
 	skellerps_t lerps[FS_COUNT], *lerp;
 	size_t numgroups;
@@ -1256,7 +1253,7 @@ static const float *Alias_GetBoneInformation(galiasinfo_t *inf, const framestate
 
 	lerps[0].skeltype = SKEL_IDENTITY; //just in case.
 #ifdef SKELETALOBJECTS
-	if (framestate->bonestate && framestate->bonecount >= inf->numbones)
+	if (framestate->bonestate && framestate->bonecount >= numbones)
 	{
 		lerps[0].skeltype = framestate->skeltype;
 		lerps[0].firstbone = 0;
@@ -1270,13 +1267,18 @@ static const float *Alias_GetBoneInformation(galiasinfo_t *inf, const framestate
 	else
 #endif
 	{
-		numgroups = Alias_FindRawSkelData(inf, framestate, lerps, 0, inf->numbones);
+		numgroups = Alias_FindRawSkelData(inf, framestate, lerps, 0, numbones, boneinfo);
 	}
 
 	//try to return data in-place.
 	if (numgroups==1 && lerps[0].lerpcount == 1)
 	{
-		ret = Alias_ConvertBoneData(lerps[0].skeltype, lerps[0].pose[0], min(lerps[0].endbone, inf->numbones), inf->ofsbones, targettype, targetbuffer, targetbufferalt, maxbufferbones);
+		ret = Alias_ConvertBoneData(lerps[0].skeltype, lerps[0].pose[0], min(lerps[0].endbone, inf->numbones), inf->ofsbones, targettype, targetbuffer, targetbufferalt, numbones);
+		if (ret == lerps[0].needsfree[0])
+		{	//bum
+			memcpy(targetbuffer, ret, sizeof(float)*min(lerps[0].endbone, numbones)*12);
+			ret = targetbuffer;
+		}
 		BZ_Free(lerps[0].needsfree[0]);
 		return ret;
 	}
@@ -1365,7 +1367,7 @@ static const float *Alias_GetBoneInformation(galiasinfo_t *inf, const framestate
 		}
 	}
 
-	return Alias_ConvertBoneData(lerps[0].skeltype, targetbuffer, inf->numbones, inf->ofsbones, targettype, targetbuffer, targetbufferalt, maxbufferbones);
+	return Alias_ConvertBoneData(lerps[0].skeltype, targetbuffer, inf->numbones, inf->ofsbones, targettype, targetbuffer, targetbufferalt, numbones);
 }
 
 static void Alias_BuildSkeletalMesh(mesh_t *mesh, framestate_t *framestate, galiasinfo_t *inf)
@@ -1375,9 +1377,9 @@ static void Alias_BuildSkeletalMesh(mesh_t *mesh, framestate_t *framestate, gali
 	const float *morphweights;
 
 	if (meshcache.bonecachetype != SKEL_INVERSE_ABSOLUTE)
-		meshcache.usebonepose = Alias_GetBoneInformation(inf, framestate, meshcache.bonecachetype=SKEL_INVERSE_ABSOLUTE, meshcache.boneposebuffer1, meshcache.boneposebuffer2, MAX_BONES);
+		meshcache.usebonepose = Alias_GetBoneInformation(inf, framestate, meshcache.bonecachetype=SKEL_INVERSE_ABSOLUTE, meshcache.boneposebuffer1, meshcache.boneposebuffer2, inf->numbones, NULL);
 
-	morphweights = inf->AnimateMorphs?inf->AnimateMorphs(inf, framestate):NULL;
+	morphweights = inf->AnimateMorphs?inf->AnimateMorphs(inf, framestate, alloca(sizeof(*morphweights)*inf->nummorphs)):NULL;
 	if (morphweights)
 	{
 		size_t m,v;
@@ -1820,6 +1822,7 @@ qboolean Alias_GAliasBuildMesh(mesh_t *mesh, vbo_t **vbop, galiasinfo_t *inf, in
 	{
 		//if we have skeletal xyz info, but no skeletal weights, then its a partial model that cannot possibly be animated.
 		meshcache.usebonepose = NULL;
+		meshcache.bonecachetype = -1;
 		mesh->xyz_array = inf->ofs_skel_xyz;
 		mesh->xyz2_array = NULL;
 		mesh->normals_array = inf->ofs_skel_norm;
@@ -1875,7 +1878,7 @@ qboolean Alias_GAliasBuildMesh(mesh_t *mesh, vbo_t **vbop, galiasinfo_t *inf, in
 			else
 			{
 				if (meshcache.bonecachetype != SKEL_ABSOLUTE)
-					meshcache.usebonepose = Alias_GetBoneInformation(inf, &e->framestate, meshcache.bonecachetype=SKEL_ABSOLUTE, meshcache.boneposebuffer1, meshcache.boneposebuffer2, MAX_BONES);
+					meshcache.usebonepose = Alias_GetBoneInformation(inf, &e->framestate, meshcache.bonecachetype=SKEL_ABSOLUTE, meshcache.boneposebuffer1, meshcache.boneposebuffer2, MAX_BONES, NULL);
 #ifndef SERVERONLY
 				if (inf->shares_bones != surfnum && qrenderer)
 					Alias_DrawSkeletalBones(inf->ofsbones, (const float *)meshcache.usebonepose, inf->numbones, e->framestate.g[0].endbone);
@@ -1885,7 +1888,7 @@ qboolean Alias_GAliasBuildMesh(mesh_t *mesh, vbo_t **vbop, galiasinfo_t *inf, in
 		else
 		{
 			if (meshcache.bonecachetype != SKEL_INVERSE_ABSOLUTE)
-				meshcache.usebonepose = Alias_GetBoneInformation(inf, &e->framestate, meshcache.bonecachetype=SKEL_INVERSE_ABSOLUTE, meshcache.boneposebuffer1, meshcache.boneposebuffer2, MAX_BONES);
+				meshcache.usebonepose = Alias_GetBoneInformation(inf, &e->framestate, meshcache.bonecachetype=SKEL_INVERSE_ABSOLUTE, meshcache.boneposebuffer1, meshcache.boneposebuffer2, MAX_BONES, NULL);
 
 			//hardware bone animation
 			mesh->xyz_array = inf->ofs_skel_xyz;
@@ -2632,7 +2635,7 @@ static qboolean Mod_Trace(model_t *model, int forcehullnum, const framestate_t *
 				if (curbonesurf != mod->shares_bones)
 				{
 					curbonesurf = mod->shares_bones;
-					bonepose = Alias_GetBoneInformation(mod, framestate, SKEL_INVERSE_ABSOLUTE, buffer, bufferalt, MAX_BONES);
+					bonepose = Alias_GetBoneInformation(mod, framestate, SKEL_INVERSE_ABSOLUTE, buffer, bufferalt, MAX_BONES, NULL);
 				}
 				posedata = alloca(mod->numverts*sizeof(vecV_t));
 				Alias_TransformVerticies_V(bonepose, mod->numverts, mod->ofs_skel_idx[0], mod->ofs_skel_weight[0], mod->ofs_skel_xyz[0], posedata[0]);
@@ -3170,7 +3173,7 @@ static void Mod_GenerateMeshVBO(model_t *mod, galiasinfo_t *galias)
 			}
 		}
 		else
-			Con_DPrintf("\"%s\":\"%s\" exceeds gpu bone limit and will be software-skinned - %i > %i\n", mod->name, galias->surfacename, k, sh_config.max_gpu_bones);
+			Con_DPrintf(CON_WARNING"PERF: \"%s\":\"%s\" exceeds gpu bone limit and will be software-skinned - %i > %i\n", mod->name, galias->surfacename, k, sh_config.max_gpu_bones);
 	}
 	if (galias->mappedbones)
 	{
@@ -3834,8 +3837,6 @@ static void Mod_FloodFillSkin( qbyte *skin, int skinwidth, int skinheight )
 static void *Q1MDL_LoadSkins_GL (galiasinfo_t *galias, dmdl_t *pq1inmodel, model_t *loadmodel, daliasskintype_t *pskintype, uploadfmt_t skintranstype)
 {
 	skinframe_t *frames;
-	char skinname[MAX_QPATH];
-	char alttexpath[MAX_QPATH];
 	int i;
 	int s, t;
 	float sinter;
@@ -3843,8 +3844,6 @@ static void *Q1MDL_LoadSkins_GL (galiasinfo_t *galias, dmdl_t *pq1inmodel, model
 	daliasskininterval_t *intervals;
 	qbyte *data, *saved;
 	galiasskin_t *outskin = galias->ofsskins;
-	const char *slash;
-	unsigned int texflags;
 
 	s = pq1inmodel->skinwidth*pq1inmodel->skinheight;
 	for (i = 0; i < pq1inmodel->numskins; i++)
@@ -3857,37 +3856,15 @@ static void *Q1MDL_LoadSkins_GL (galiasinfo_t *galias, dmdl_t *pq1inmodel, model
 
 //but only preload it if we have no replacement.
 			outskin->numframes=1;
-			if (1 || /*!TEXVALID(texture) ||*/ (loadmodel->engineflags & MDLF_NOTREPLACEMENTS))
-			{
-				//we're not using 24bits
-				frames = ZG_Malloc(&loadmodel->memgroup, sizeof(*frames)+s);
-				saved = (qbyte*)(frames+1);
-				frames[0].texels = saved;
-				memcpy(saved, pskintype+1, s);
-				if (i == 0) //Vanilla bug: ONLY skin 0 is flood-filled (the vanilla code operates on a cached 'skin' variable that does NOT get updated between skins reflooding skin 0). We still don't like flood fills either. Hexen2 has the same issue.
-					Mod_FloodFillSkin(saved, outskin->skinwidth, outskin->skinheight);
-			}
-			else
-			{
-				frames = ZG_Malloc(&loadmodel->memgroup, sizeof(*frames));
 
-				Q_snprintfz(skinname, sizeof(skinname), "%s_%i.lmp", slash, i);
-				frames[0].texnums.base = R_LoadReplacementTexture(skinname, alttexpath, texflags, frames[0].texels, outskin->skinwidth, outskin->skinheight, skintranstype);
-				if (r_fb_models.ival)
-				{
-					Q_snprintfz(skinname, sizeof(skinname), "%s_%i_luma.lmp", slash, i);
-					frames[0].texnums.fullbright = R_LoadReplacementTexture(skinname, alttexpath, texflags, frames[0].texels, outskin->skinwidth, outskin->skinheight, TF_TRANS8_FULLBRIGHT);
-				}
-				if (r_loadbumpmapping)
-				{
-					Q_snprintfz(skinname, sizeof(skinname), "%s_%i_norm.lmp", slash, i);
-					frames[0].texnums.bump = R_LoadReplacementTexture(skinname, alttexpath, texflags|IF_TRYBUMP|IF_NOSRGB, frames[0].texels, outskin->skinwidth, outskin->skinheight, TF_HEIGHT8PAL);
-				}
-				Q_snprintfz(skinname, sizeof(skinname), "%s_%i_shirt.lmp", slash, i);
-				frames[0].texnums.upperoverlay = R_LoadReplacementTexture(skinname, alttexpath, texflags, NULL, outskin->skinwidth, outskin->skinheight, TF_INVALID);
-				Q_snprintfz(skinname, sizeof(skinname), "%s_%i_pants.lmp", slash, i);
-				frames[0].texnums.loweroverlay = R_LoadReplacementTexture(skinname, alttexpath, texflags, NULL, outskin->skinwidth, outskin->skinheight, TF_INVALID);
-			}
+			//the actual texture gets loaded after the shader.
+			frames = ZG_Malloc(&loadmodel->memgroup, sizeof(*frames)+s);
+			saved = (qbyte*)(frames+1);
+			frames[0].texels = saved;
+			memcpy(saved, pskintype+1, s);
+			if (i == 0) //Vanilla bug: ONLY skin 0 is flood-filled (the vanilla code operates on a cached 'skin' variable that does NOT get updated between skins reflooding skin 0). We still don't like flood fills either. Hexen2 has the same issue.
+				Mod_FloodFillSkin(saved, outskin->skinwidth, outskin->skinheight);
+
 			Q_snprintfz(frames[0].shadername, sizeof(frames[0].shadername), "%s_%i.lmp", loadmodel->name, i);
 			frames[0].shader = NULL;
 			frames[0].defaultshader = NULL;
@@ -5135,11 +5112,11 @@ int Mod_GetNumBones(model_t *model, qboolean allowtags)
 	return 0;
 }
 
-int Mod_GetBoneRelations(model_t *model, int firstbone, int lastbone, framestate_t *fstate, float *result)
+int Mod_GetBoneRelations(model_t *model, int firstbone, int lastbone, const galiasbone_t *boneinfo, const framestate_t *fstate, float *result)
 {
 #ifdef SKELETALMODELS
 	if (model && model->type == mod_alias)
-		return Alias_BlendBoneData(Mod_Extradata(model), fstate, result, SKEL_RELATIVE, firstbone, lastbone);
+		return Alias_BlendBoneData(Mod_Extradata(model), fstate, result, SKEL_RELATIVE, firstbone, lastbone, boneinfo);
 #endif
 #ifdef HALFLIFEMODELS
 	if (model && model->type == mod_halflife)
@@ -5156,7 +5133,10 @@ galiasbone_t *Mod_GetBoneInfo(model_t *model, int *numbones)
 
 
 	if (!model || model->type != mod_alias)
+	{
+		*numbones = 0;
 		return NULL;
+	}
 
 	inf = Mod_Extradata(model);
 
@@ -5252,7 +5232,7 @@ qboolean Mod_GetTag(model_t *model, int tagnum, framestate_t *fstate, float *res
 			}
 			else //try getting the data from the frame state
 			{
-				numbones = Mod_GetBoneRelations(model, 0, tagnum+1, fstate, relatives);
+				numbones = Mod_GetBoneRelations(model, 0, tagnum+1, NULL, fstate, relatives);
 				lerps = relatives;
 			}
 
@@ -5323,7 +5303,7 @@ qboolean Mod_GetTag(model_t *model, int tagnum, framestate_t *fstate, float *res
 
 			//try getting the data from the frame state
 			if (!numbonegroups)
-				numbonegroups = Alias_FindRawSkelData(inf, fstate, lerps, 0, inf->numbones);
+				numbonegroups = Alias_FindRawSkelData(inf, fstate, lerps, 0, inf->numbones, NULL);
 
 			//try base pose?
 			if (!numbonegroups && inf->baseframeofs)
@@ -5677,7 +5657,7 @@ const char *Mod_FrameNameForNum(model_t *model, int surfaceidx, int num)
 		while(surfaceidx-->0 && inf)
 			inf = inf->nextsurf;
 
-		if (!inf || num >= inf->numanimations)
+		if (!inf || (unsigned)num >= (unsigned)inf->numanimations)
 			return NULL;
 		group = inf->ofsanimations;
 		return group[num].name;
diff --git a/engine/common/com_mesh.h b/engine/common/com_mesh.h
index 3a6220934..abcde24d7 100644
--- a/engine/common/com_mesh.h
+++ b/engine/common/com_mesh.h
@@ -49,20 +49,27 @@ typedef struct galiasevent_s
 	char *data;
 } galiasevent_t;
 
+typedef struct galiasrefpose_s
+{
+	vec4_t quat;
+	vec3_t org;
+	vec3_t scale;
+} galiasrefpose_t;
+
 //a frame group (aka: animation)
 typedef struct galiasanimation_s
 {
 #ifdef SKELETALMODELS
 	skeltype_t skeltype;	//for models with transforms, states that bones need to be transformed from their parent.
 							//this is actually bad, and can result in bones shortening as they interpolate.
-	float *(QDECL *GetRawBones)(const struct galiasinfo_s *mesh, const struct galiasanimation_s *a, float time, float *bonematrixstorage, int numbones);
+	float *(QDECL *GetRawBones)(const struct galiasinfo_s *mesh, const struct galiasanimation_s *a, float time, float *bonematrixstorage, const struct galiasbone_s *boneinf, int numbones);
 	void *boneofs;	//numposes*12*numbones
 #endif
 	qboolean loop;
 	int numposes;
 	//float *poseendtime;	//first starts at 0, anim duration is poseendtime[numposes-1]
 	float rate;				//average framerate of animation.
-	int action;
+	int action;				//-1 for none.
 	float actionweight;
 #ifdef NONSKELETALMODELS
 	galiaspose_t *poseofs;
@@ -76,9 +83,15 @@ typedef struct galiasbone_s galiasbone_t;
 struct galiasbone_s
 {
 	char name[64];
+#if MAX_BONES>32767
 	int parent;
+#else
+	short parent;
+#endif
+	unsigned char group;
 //	float radius;
 	float inverse[12];
+	galiasrefpose_t ref;
 };
 
 typedef struct
@@ -180,10 +193,10 @@ typedef struct galiasinfo_s
 
 #ifdef SKELETALMODELS
 	boneidx_t *bonemap;		//filled in automatically if our mesh has more gpu bones than we can support
-	unsigned int mappedbones;
+	unsigned int mappedbones;	//number of private per-mesh bones.
 	unsigned int nummorphs;	//extra data after the xyz/norm/stvect arrays
-	const float *(QDECL *AnimateMorphs)(const struct galiasinfo_s *surf, const framestate_t *framestate);
-	int meshrootbone;
+	const float *(QDECL *AnimateMorphs)(const struct galiasinfo_s *surf, const framestate_t *framestate, float *resultmorphs);	//returns a float weight[nummorphs] array (base verts have an implicit weight of 1, so these are purely additive)
+	int meshrootbone;		//unused by engine. for loader callbacks to (ab)use
 
 	float *baseframeofs;	/*non-heirachical*/
 	int numbones;
@@ -246,6 +259,7 @@ typedef struct modplugfuncs_s
 	void (QDECL *VectorAngles)(const float *forward, const float *up, float *result, qboolean meshpitch);
 	void (QDECL *AngleVectors)(const vec3_t angles, vec3_t forward, vec3_t right, vec3_t up);
 	void (QDECL *GenMatrixPosQuat4Scale)(const vec3_t pos, const vec4_t quat, const vec3_t scale, float result[12]);
+	void (QDECL *QuaternionSlerp)(const vec4_t p, vec4_t q, float t, vec4_t qt);
 
 	//bone stuff
 	void (QDECL *ForceConvertBoneData)(skeltype_t sourcetype, const float *sourcedata, size_t bonecount, galiasbone_t *bones, skeltype_t desttype, float *destbuffer, size_t destbonecount);
@@ -267,13 +281,10 @@ typedef struct modplugfuncs_s
 	void (*RenderDynamicLightmaps) (struct msurface_s *surf);
 	entity_t *(*NewSceneEntity) (void);
 	void (*EndSubmodelLoad)(struct model_s *submod, int modelloadstate);
-#if sizeof_index_t==2
-	#define plugmodfuncs_name "Models"
-#else
-	#define plugmodfuncs_name "Models_IDX" STRINGIFY(sizeof_index_t)
-#endif
+	#define plugmodfuncs_name_idxpostfix "_IDX" STRINGIFY(sizeof_index_t)
+#define plugmodfuncs_name "Models" plugmodfuncs_name_idxpostfix
 } plugmodfuncs_t;
-#define MODPLUGFUNCS_VERSION 3
+#define MODPLUGFUNCS_VERSION 4
 
 #ifdef SKELETALMODELS
 void Alias_TransformVerticies(float *bonepose, galisskeletaltransforms_t *weights, int numweights, vecV_t *xyzout, vec3_t *normout);
diff --git a/engine/common/common.c b/engine/common/common.c
index 42804c0da..888e04f32 100644
--- a/engine/common/common.c
+++ b/engine/common/common.c
@@ -1273,7 +1273,7 @@ int MSG_ReadSize16 (sizebuf_t *sb)
 	{
 		int solid = (((ssolid>>7) & 0x1F8) - 32+32768)<<16;	/*up can be negative*/
 		solid|= ((ssolid & 0x1F)<<3);
-		solid|= ((ssolid & 0x3E0)<<10);
+		solid|= ((ssolid & 0x3E0)<<6);
 		return solid;
 	}
 }
@@ -2192,6 +2192,20 @@ int MSG_ReadChar (void)
 	return c;
 }
 
+int MSG_PeekByte(void)
+{
+	unsigned int msg_readcount;
+
+	if (msg_readmsg->packing!=SZ_RAWBYTES)
+		return -1;
+
+	msg_readcount = msg_readmsg->currentbit>>3;
+	if (msg_readcount+1 > msg_readmsg->cursize)
+		return -1;
+
+	return (unsigned char)msg_readmsg->data[msg_readcount];
+}
+
 int MSG_ReadByte (void)
 {
 	unsigned char	c;
@@ -2625,6 +2639,7 @@ void MSGQW_ReadDeltaUsercmd (const usercmd_t *from, usercmd_t *move, int protove
 	}
 }
 
+#ifdef HAVE_SERVER
 void MSGQ2_ReadDeltaUsercmd (client_t *cl, const usercmd_t *from, usercmd_t *move)
 {
 	int bits;
@@ -2729,6 +2744,7 @@ void MSGQ2_ReadDeltaUsercmd (client_t *cl, const usercmd_t *from, usercmd_t *mov
 	else
 		move->lightlevel = MSG_ReadByte ();
 }
+#endif
 
 void MSG_ReadData (void *data, int len)
 {
@@ -5671,7 +5687,11 @@ static void COM_Version_f (void)
 	Con_Printf("Renderers:");
 #ifdef GLQUAKE
 #ifdef GLESONLY
-	Con_Printf(" OpenGLES");
+	#ifdef FTE_TARGET_WEB	//shuld we be just asking the video code for a list?...
+		Con_Printf(" WebGL");
+	#else
+		Con_Printf(" OpenGLES");
+	#endif
 #else
 	Con_Printf(" OpenGL");
 #endif
@@ -5711,6 +5731,10 @@ static void COM_Version_f (void)
 	Con_Printf("Compiled with Cygwin\n");
 #endif
 
+#ifdef FTE_TARGET_WEB
+	Con_Printf("Compiled with emscripten %i.%i.%i\n", __EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__);
+#endif
+
 #ifdef __clang__
 	Con_Printf("Compiled with clang version: %i.%i.%i (%s)\n",__clang_major__, __clang_minor__, __clang_patchlevel__, __VERSION__);
 #elif defined(__GNUC__)
@@ -5831,28 +5855,36 @@ static void COM_Version_f (void)
 	#if !defined(VOICECHAT)
 		Con_Printf(" disabled");
 	#else
-		#ifdef SPEEX_STATIC
-			Con_Printf(" speex");
-			Con_DPrintf("^h(static)");
-		#else
-			Con_Printf(" speex^h(dynamic)");
+		#ifdef HAVE_SPEEX
+			#ifdef SPEEX_STATIC
+				Con_Printf(" speex");
+				Con_DPrintf("^h(static)");
+			#else
+				Con_Printf(" speex^h(dynamic)");
+			#endif
 		#endif
-		#ifdef OPUS_STATIC
-			Con_Printf(" opus");
-			Con_DPrintf("^h(static)");
-		#else
-			Con_Printf(" opus^h(dynamic)");
+		#ifdef HAVE_OPUS
+			#ifdef OPUS_STATIC
+				Con_Printf(" opus");
+				Con_DPrintf("^h(static)");
+			#else
+				Con_Printf(" opus^h(dynamic)");
+			#endif
 		#endif
 	#endif
 	Con_Printf("\n");
 
 	Con_Printf("^3Audio Decoders:^7");
+	#ifdef FTE_TARGET_WEB
+		Con_DPrintf(" javascript");
+	#endif
 	#ifndef AVAIL_OGGVORBIS
 		Con_DPrintf(" ^h(disabled: Ogg Vorbis)^7");
 	#elif defined(LIBVORBISFILE_STATIC)
-		Con_Printf(" Ogg Vorbis");
+		Con_Printf(" Ogg-Vorbis");
+		Con_DPrintf("^h(static)");
 	#else
-		Con_Printf(" Ogg Vorbis^h(dynamic)");
+		Con_Printf(" Ogg-Vorbis^h(dynamic)");
 	#endif
 	#if defined(AVAIL_MP3_ACM)
 		Con_Printf(" mp3(system)");
@@ -5893,7 +5925,12 @@ static void COM_Version_f (void)
 	Con_DPrintf(" ^h(disabled: freetype2)^7");
 #endif
 #ifdef AVAIL_OPENAL
-	Con_Printf(" openal^h(dynamic)");
+	#ifdef FTE_TARGET_WEB
+		Con_Printf(" WebAudio");
+		Con_DPrintf("^h(static)");
+	#else
+		Con_Printf(" OpenAL^h(dynamic)");
+	#endif
 #else
 	Con_DPrintf(" ^h(disabled: openal)^7");
 #endif
@@ -5986,12 +6023,19 @@ static void COM_Version_f (void)
 #ifdef FTPSERVER
 	Con_Printf(" FTPServer");
 #endif
-#ifdef HAVE_TCP
-#ifdef TCPCONNECT
-	Con_Printf(" TCPConnect");
+#if (defined(SUPPORT_ICE)&&defined(HAVE_DTLS)) || defined(FTE_TARGET_WEB)
+	Con_Printf(" WebRTC");
 #endif
+#ifdef FTE_TARGET_WEB
+	Con_Printf(" WebSocket/WSS");
 #else
-	Con_Printf(" ^h(disabled: TCP)");
+	#if defined(HAVE_TCP)
+	#ifdef TCPCONNECT
+		Con_Printf(" TCPConnect");
+	#endif
+	#else
+		Con_Printf(" ^h(disabled: TCP)");
+	#endif
 #endif
 #ifdef HAVE_GNUTLS             //on linux
 	Con_Printf(" GnuTLS");
@@ -6705,9 +6749,6 @@ void COM_Init (void)
 	//random should be random from the start...
 	srand(time(0));
 
-#ifdef MULTITHREAD
-	Sys_ThreadsInit();
-#endif
 #ifdef LOADERTHREAD
 	COM_InitWorkerThread();
 #endif
diff --git a/engine/common/common.h b/engine/common/common.h
index 0de5cc3f4..3d61a08b0 100644
--- a/engine/common/common.h
+++ b/engine/common/common.h
@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif
 
 #define VK_NO_STDINT_H //we're handling this. please don't cause conflicts. grr.
-#if __STDC_VERSION__ >= 199901L || defined(__GNUC__)
+#if __STDC_VERSION__ >= 199901L || defined(__GNUC__) || _MSC_VER >= 1600
 	//C99 has a stdint header which hopefully contains an intptr_t
 	//its optional... but if its not in there then its unlikely you'll actually be able to get the engine to a stage where it *can* load anything
 	#include <stdint.h>
@@ -43,6 +43,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#define quint32_t uint32_t
 	#define qint64_t int64_t
 	#define quint64_t uint64_t
+	#define qintmax_t intmax_t
+	#define quintmax_t uintmax_t
 #else
 	#define qint8_t signed char	//be explicit with this one.
 	#define quint8_t unsigned char
@@ -85,6 +87,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 		#define quint64_t unsigned qint64_t
 	#endif
 
+	#define qintmax_t qint64_t
+	#define quintmax_t quint64_t
+
 	#ifndef uint32_t
 		#define int8_t		qint8_t
 		#define uint8_t		quint8_t
@@ -96,6 +101,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 		#define uint64_t	quint64_t
 		#define intptr_t	qintptr_t
 		#define uintptr_t	quintptr_t
+		#define intmax_t	qintmax_t
+		#define uintmax_t	quintmax_t
 	#endif
 #endif
 
@@ -345,6 +352,8 @@ void MSG_WriteDir (sizebuf_t *sb, float dir[3]);
 extern	qboolean	msg_badread;		// set if a read goes beyond end of message
 extern struct netprim_s msg_nullnetprim;
 
+int MSG_PeekByte(void);
+
 void MSG_BeginReading (sizebuf_t *sb, struct netprim_s prim);
 void MSG_ChangePrimitives(struct netprim_s prim);
 int MSG_GetReadCount(void);
@@ -381,7 +390,6 @@ void MSGQ2_ReadDeltaUsercmd (struct client_s *cl, const struct usercmd_s *from,
 void MSG_ReadData (void *data, int len);
 void MSG_ReadSkip (int len);
 
-
 int MSG_ReadSize16 (sizebuf_t *sb);
 void MSG_WriteSize16 (sizebuf_t *sb, unsigned int sz);
 void COM_DecodeSize(int solid, float *mins, float *maxs);
@@ -568,6 +576,7 @@ typedef struct searchpath_s
 	char logicalpath[MAX_OSPATH];	//printable hunam-readable location of the package. generally includes a system path, including nested packages.
 	char purepath[256];	//server tracks the path used to load them so it can tell the client
 	char prefix[MAX_QPATH];	//prefix to add to each file within the archive. may also be ".." to mean ignore the top-level path.
+	int crc_seed;	//can skip some hashes if this is cached.
 	int crc_check;	//client sorts packs according to this checksum
 	int crc_reply;	//client sends a different crc back to the server, for the paks it's actually loaded.
 	int orderkey;	//used to check to see if the paths were actually changed or not.
@@ -607,6 +616,7 @@ qboolean FS_GetLocMTime(flocation_t *location, time_t *modtime);
 const char *FS_GetPackageDownloadFilename(flocation_t *loc);	//returns only packages (or null)
 const char *FS_GetRootPackagePath(flocation_t *loc);			//favours packages, but falls back on gamedirs.
 
+searchpath_t *FS_GetPackage(const char *package); //for fancy stuff that should probably have its own helper...
 qboolean FS_GetPackageDownloadable(const char *package);
 char *FS_GetPackHashes(char *buffer, int buffersize, qboolean referencedonly);
 char *FS_GetPackNames(char *buffer, int buffersize, int referencedonly, qboolean ext);
@@ -660,12 +670,12 @@ char *VFS_GETS(vfsfile_t *vf, char *buffer, size_t buflen);
 void VARGS VFS_PRINTF(vfsfile_t *vf, const char *fmt, ...) LIKEPRINTF(2);
 
 enum fs_relative{
-	//note that many of theses paths can map to multiple system locations. FS_NativePath can vary somewhat in terms of what it returns, generally favouring writable locations rather then the path that actually contains a file.
+	//note that many of theses paths can map to multiple system locations. FS_SystemPath/FS_DisplayPath can vary somewhat in terms of what it returns, generally favouring writable locations rather then the path that actually contains a file.
 	FS_BINARYPATH,	//where the 'exe' is located. we'll check here for dlls too.
 	FS_LIBRARYPATH,	//for system dlls and stuff
 	FS_ROOT,		//./ (effectively -homedir if enabled, otherwise effectively -basedir arg)
 	FS_SYSTEM,		//a system path. absolute paths are explicitly allowed and expected, but not required.
-
+#define FS_RELATIVE_ISSPECIAL(r) ((r)<FS_GAME)
 	//after this point, all types must be relative to a gamedir
 	FS_GAME,		//standard search (not generally valid for writing/save/rename/delete/etc)
 	FS_GAMEONLY,	//$gamedir/
@@ -676,6 +686,8 @@ enum fs_relative{
 
 qboolean COM_WriteFile (const char *filename, enum fs_relative fsroot, const void *data, int len);
 
+char *FS_AbbreviateSize(char *buf, size_t bufsize, qofs_t fsize);	//just formats a filesize into the buffer and returns it.
+
 void FS_FlushFSHashWritten(const char *fname);
 void FS_FlushFSHashRemoved(const char *fname);
 void FS_FlushFSHashFull(void);	//too much/unknown changed...
@@ -685,7 +697,9 @@ qboolean FS_Rename2(const char *oldf, const char *newf, enum fs_relative oldrela
 qboolean FS_Remove(const char *fname, enum fs_relative relativeto);	//0 on success, non-0 on error
 qboolean FS_RemoveTree(searchpathfuncs_t *pathhandle, const char *fname);
 qboolean FS_Copy(const char *source, const char *dest, enum fs_relative relativesource, enum fs_relative relativedest);
-qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out, int outlen);	//if you really need to fopen yourself
+//qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out, int outlen);	//if you really need to fopen yourself
+qboolean FS_SystemPath(const char *fname, enum fs_relative relativeto, char *out, int outlen);	//if you really need to fopen yourself
+qboolean FS_DisplayPath(const char *fname, enum fs_relative relativeto, char *out, int outlen);	//retrieves a string for user display. prefixes may be masked for privacy.
 qboolean FS_WriteFile (const char *filename, const void *data, int len, enum fs_relative relativeto);
 void *FS_MallocFile(const char *filename, enum fs_relative relativeto, qofs_t *filesize);
 vfsfile_t *QDECL FS_OpenVFS(const char *filename, const char *mode, enum fs_relative relativeto);
@@ -964,6 +978,7 @@ extern hashfunc_t hash_sha2_384;
 extern hashfunc_t hash_sha2_512;
 extern hashfunc_t hash_crc16;		//aka ccitt, required for qw's clc_move and various bits of dp compat
 extern hashfunc_t hash_crc16_lower;
+#define hash_certfp hash_sha2_256	//This is the hash function we're using to compute *fp serverinfo. we can detect 1/2-256/2-512 by sizes, but we need consistency to avoid confusion in clientside things too.
 unsigned int hashfunc_terminate_uint(const hashfunc_t *hash, void *context); //terminate, except returning the digest as a uint instead of a blob. folds the digest if longer than 4 bytes.
 unsigned int CalcHashInt(const hashfunc_t *hash, const void *data, size_t datasize);
 size_t CalcHash(const hashfunc_t *hash, unsigned char *digest, size_t maxdigestsize, const unsigned char *data, size_t datasize);
@@ -1001,7 +1016,6 @@ typedef enum {
 } logtype_t;
 void Log_String (logtype_t lognum, const char *s);
 void Con_Log (const char *s);
-void Log_Logfile_f (void);
 void Log_Init(void);
 void Log_ShutDown(void);
 #ifdef IPLOG
@@ -1085,8 +1099,15 @@ json_t *JSON_FindChild(json_t *t, const char *child);	//find a named child in an
 json_t *JSON_GetIndexed(json_t *t, unsigned int idx);	//find an indexed child in an array (or object, though slower)
 double JSON_ReadFloat(json_t *t, double fallback);		//read a numeric value.
 size_t JSON_ReadBody(json_t *t, char *out, size_t outsize);	//read a string value.
+size_t JSON_GetCount(json_t *t);
 //exotic fancy functions
-json_t *JSON_ParseNode(json_t *t, const char *namestart, const char *nameend, const char *json, int *jsonpos, int jsonlen); //fancy parsing.
+struct jsonparsectx_s
+{
+	char const *const data;
+	const size_t size;
+	size_t pos;
+};
+json_t *JSON_ParseNode(json_t *t, const char *namestart, const char *nameend, struct jsonparsectx_s *ctx); //fancy parsing.
 //helpers
 json_t *JSON_FindIndexedChild(json_t *t, const char *child, unsigned int idx);		//just a helper.
 qboolean JSON_Equals(json_t *t, const char *child, const char *expected);			//compares a bit faster.
diff --git a/engine/common/config_freecs.h b/engine/common/config_freecs.h
index 16013a7a7..afc3ca468 100644
--- a/engine/common/config_freecs.h
+++ b/engine/common/config_freecs.h
@@ -126,10 +126,8 @@
 #undef Q3SERVER		//q3 server stuff.
 #undef HEXEN2		//runs hexen2 gamecode, supports hexen2 file formats.
 #undef NQPROT		//act as an nq client/server, with nq gamecode.
-////#undef WEBSERVER	//sv_ftp + sv_http cvars.
 #undef WEBCLIENT	//uri_get+any internal downloads etc
 #undef RUNTIMELIGHTING	//automatic generation of .lit files
-#undef R_XFLIP		//old silly thing
 #undef TEXTEDITOR	//my funky text editor! its awesome!
 #undef TCPCONNECT	//support for playing over tcp sockets, instead of just udp. compatible with qizmo.
 #undef IRCCONNECT	//lame support for routing game packets via irc server. not a good idea.
diff --git a/engine/common/config_fteqw.h b/engine/common/config_fteqw.h
index 74310a797..ff7ed2a03 100644
--- a/engine/common/config_fteqw.h
+++ b/engine/common/config_fteqw.h
@@ -36,7 +36,6 @@
 #define PSET_SCRIPT				//scriptable particles (both fte's and importing effectinfo)
 #define RTLIGHTS
 #define RUNTIMELIGHTING			//automatic generation of .lit files
-#define R_XFLIP					//old silly thing
 
 //Extra misc features.
 //#define CLIENTONLY			//
@@ -154,7 +153,7 @@
 //#define IRCCONNECT			//lame support for routing game packets via irc server. not a good idea.
 #define SUPPORT_ICE				//Internet Connectivity Establishment, for use by plugins to establish voice or game connections.
 #define CL_MASTER				//Clientside Server Browser functionality.
-#define PACKAGEMANAGER			//Allows the user to enable/disable/download(with WEBCLIENT) packages and plugins.
+#define PACKAGEMANAGER			//Allows the user to enable/disable/download(with WEBCLIENT) packages and plugins. Also handles map packages.
 
 // Audio Drivers
 #define AVAIL_OPENAL
@@ -191,22 +190,23 @@
 ////#define QTERM				//qterm... adds a console command that allows running programs from within quake - bit like xterm.
 //#define SVCHAT					//ancient lame builtin to support NPC-style chat...
 ////#define SV_MASTER			//Support running the server as a master server. Should probably not be used.
-////#define WEBSERVER			//outdated sv_http cvar. new stuff acts via sv_port_tcp instead (which also gives https).
 ////#define QUAKESPYAPI			//define this if you want the engine to be usable via gamespy/quakespy, which has been dead for a long time now. forces the client to use a single port for all outgoing connections, which hurts reconnects.
 
 
-#ifdef COMPILE_OPTS
+#ifdef COMPILE_OPTS //This is a block of hints for the makefile to decide which deps to link.
 //things to configure qclib, which annoyingly doesn't include this file itself
 //-DOMIT_QCC	//disable the built-in qcc 
 //-DSIMPLE_QCVM	//disable qc debugging and 32bit opcodes
 #ifndef AVAIL_ZLIB
 //-DNO_ZLIB	//disable zlib
 #endif
-#ifdef AVAIL_PNGLIB
--DLINK_PNG
-#endif
-#ifdef AVAIL_JPEGLIB
--DLINK_JPEG
+#ifndef FTE_TARGET_WEB
+	#ifdef AVAIL_PNGLIB
+		-DLINK_PNG
+	#endif
+	#ifdef AVAIL_JPEGLIB
+		-DLINK_JPEG
+	#endif
 #endif
 #if defined(PLUGINS) && (defined(Q3SERVER) || defined(Q3CLIENT))
 -DLINK_QUAKE3	//ask the makefile to bake the quake3 plugin into the engine itself.
@@ -217,15 +217,24 @@
 #ifndef AVAIL_BOTLIB
 -DNO_BOTLIB	//disable static botlib
 #endif
-//-DNO_VORBISFILE	//disable static vorbisfile
+#ifndef FTE_TARGET_WEB
+-DLINK_VORBISFILE	//disable static vorbisfile
+#endif
 
 
 //enable some staticaly linked libraries
+#ifndef FTE_TARGET_WEB
 -DLINK_FREETYPE		//international text requires international fonts.
+#endif
 
 #if defined(USE_INTERNAL_ODE) && !defined(ODE_DYNAMIC)
 -DLINK_ODE
 #endif
 
+#if defined(PLUGINS)
+//-DLINK_EZHUD		//uncomment this line to statically link the ezhud plugin (eg for the web-rel target).
+#endif
+//-DLINK_OPENSSL	//statically link our openssl plugin into the engine instead of being separate. NOTE: openssl<3 is a license no-go, 3 still requires gpl3 (2 prohits patent).
+
 //-Os		//optimise for size instead of speed. less cpu cache needed means that its sometimes faster anyway.
 #endif
diff --git a/engine/common/config_minimal.h b/engine/common/config_minimal.h
index 952c5b34b..2680d4253 100644
--- a/engine/common/config_minimal.h
+++ b/engine/common/config_minimal.h
@@ -38,7 +38,6 @@
 //#define PSET_SCRIPT			//scriptable particles (both fte's and importing effectinfo)
 //#define RTLIGHTS
 //#define RUNTIMELIGHTING		//automatic generation of .lit files
-//#define R_XFLIP				//old silly thing
 
 //Extra misc features.
 //#define CLIENTONLY			//
@@ -193,7 +192,6 @@
 ////#define QTERM				//qterm... adds a console command that allows running programs from within quake - bit like xterm.
 //#define SVCHAT				//ancient lame builtin to support NPC-style chat...
 ////#define SV_MASTER			//Support running the server as a master server. Should probably not be used.
-////#define WEBSERVER			//outdated sv_http cvar. new stuff acts via sv_port_tcp instead (which also gives https).
 ////#define QUAKESPYAPI			//define this if you want the engine to be usable via gamespy/quakespy, which has been dead for a long time now. forces the client to use a single port for all outgoing connections, which hurts reconnects.
 
 
diff --git a/engine/common/config_nocompat.h b/engine/common/config_nocompat.h
index 6b7f9f654..fef1a1eff 100644
--- a/engine/common/config_nocompat.h
+++ b/engine/common/config_nocompat.h
@@ -36,7 +36,6 @@
 #define PSET_SCRIPT				//scriptable particles (both fte's and importing effectinfo)
 #define RTLIGHTS
 //#define RUNTIMELIGHTING		//automatic generation of .lit files
-//#define R_XFLIP				//old silly thing
 
 //Extra misc features.
 //#define CLIENTONLY			//
@@ -191,7 +190,6 @@
 ////#define QTERM				//qterm... adds a console command that allows running programs from within quake - bit like xterm.
 //#define SVCHAT				//ancient lame builtin to support NPC-style chat...
 ////#define SV_MASTER			//Support running the server as a master server. Should probably not be used.
-////#define WEBSERVER			//outdated sv_http cvar. new stuff acts via sv_port_tcp instead (which also gives https).
 ////#define QUAKESPYAPI			//define this if you want the engine to be usable via gamespy/quakespy, which has been dead for a long time now. forces the client to use a single port for all outgoing connections, which hurts reconnects.
 
 
diff --git a/engine/common/config_wastes.h b/engine/common/config_wastes.h
index a24540231..cff085187 100644
--- a/engine/common/config_wastes.h
+++ b/engine/common/config_wastes.h
@@ -101,14 +101,14 @@
 #define TERRAIN
 
 /* audio */
-#define AVAIL_DSOUND
+#define AVAIL_DSOUND
 #undef AVAIL_OPENAL
 #define AVAIL_OGGVORBIS
 #define HAVE_OPUS
 #define VOICECHAT
-
-/* todo: make OpenAL only */
-#define HAVE_MIXER
+
+/* todo: make OpenAL only */
+#define HAVE_MIXER
 
 /* Model formats, IQM/VVM and HLMDL for legacy maps */
 #define INTERQUAKEMODELS
@@ -168,9 +168,7 @@
 #undef Q3SERVER		/* q3 server stuff */
 #undef HEXEN2		/* runs hexen2 gamecode, supports hexen2 file formats */
 #undef NQPROT		/* act as an nq client/server, with nq gamecode */
-#undef WEBSERVER	/* sv_ftp + sv_http cvars */
 #undef RUNTIMELIGHTING	/* automatic generation of .lit files */
-#undef R_XFLIP		/* old silly thing */
 #undef TEXTEDITOR	/* because emacs */
 #undef TCPCONNECT	/* support for playing over tcp sockets, instead of just udp. compatible with qizmo */
 #undef IRCCONNECT	/* lame support for routing game packets via irc server. not a good idea */
diff --git a/engine/common/console.h b/engine/common/console.h
index 002a3c1dc..7594fbdc5 100644
--- a/engine/common/console.h
+++ b/engine/common/console.h
@@ -95,6 +95,9 @@ extern conchar_t q3codemasks[MAXQ3COLOURS];
 #define CON_WARNING "^&E0"
 #define CON_ERROR   "^&C0"
 #define CON_NOTICE  "^&-1"
+#if defined(_DEBUG) || defined(FTE_TARGET_WEB)/*urgh...*/
+#define CON_DEBUG	CON_WARNING __FILE__":"STRINGIFY(__LINE__)" "
+#endif
 
 #define isextendedcode(x) ((x >= '0' && x <= '9') || (x >= 'A' && x <= 'F') || x == '-')
 #define ishexcode(x) ((x >= '0' && x <= '9') || (x >= 'A' && x <= 'F') || (x >= 'a' && x <= 'f'))
@@ -245,7 +248,7 @@ void VARGS Con_Printf (const char *fmt, ...) LIKEPRINTF(1);
 void VARGS Con_TPrintf (translation_t text, ...);
 void VARGS Con_DPrintf (const char *fmt, ...) LIKEPRINTF(1);	//developer>=1, for stuff that's probably actually slightly useful
 void VARGS Con_DLPrintf (int level, const char *fmt, ...) LIKEPRINTF(2);	//developer>=2, for spammy stuff
-void VARGS Con_ThrottlePrintf (float *timer, int developerlevel, const char *fmt, ...); //for spammed warnings, so they don't spam prints with every single frame/call. the timer arg should be a static local.
+void VARGS Con_ThrottlePrintf (float *timer, int developerlevel, const char *fmt, ...) LIKEPRINTF(3); //for spammed warnings, so they don't spam prints with every single frame/call. the timer arg should be a static local.
 void VARGS Con_SafePrintf (const char *fmt, ...) LIKEPRINTF(1);
 void Con_Footerf(console_t *con, qboolean append, const char *fmt, ...) LIKEPRINTF(3); 
 void Con_Clear_f (void);
diff --git a/engine/common/cvar.c b/engine/common/cvar.c
index 6928203b1..4ed8c3eca 100644
--- a/engine/common/cvar.c
+++ b/engine/common/cvar.c
@@ -474,7 +474,7 @@ showhelp:
 			else
 				col = S_COLOR_YELLOW;	//cvar is changed, but won't be saved to a config so w/e.
 			if (cmd->flags & CVAR_NOUNSAFEEXPAND)
-				Con_Printf("^[%s%s\\type\\%s\\tip\\"S_COLOR_YELLOW"%s^]", col, cmd->name, cmd->name, cmd->description?cmd->description:"");	//cvar is changed, but won't be saved to a config so w/e.
+				Con_Printf("^[%s%s\\type\\%s\\tip\\<Current value is hidden>\n\n"S_COLOR_YELLOW"%s^]", col, cmd->name, cmd->name, cmd->description?cmd->description:"");	//cvar is changed, but won't be saved to a config so w/e.
 			else
 				Con_Printf("^[%s%s\\type\\%s %s\\tip\\Default: %s\nCurrent: %s\n\n"S_COLOR_YELLOW"%s^]", col, cmd->name, cmd->name,cmd->string, cmd->defaultstr,cmd->string, cmd->description?cmd->description:"");	//cvar is changed, but won't be saved to a config so w/e.
 			total++;
@@ -1066,6 +1066,10 @@ static cvar_t *Cvar_SetCore (cvar_t *var, const char *value, qboolean force)
 		}
 
 		Z_Free (latch);	// free the old value string
+
+#ifdef HAVE_SERVER
+		MSV_SendCvarChange(var);
+#endif
 	}
 
 	if (var->latched_string)	//we may as well have this here.
diff --git a/engine/common/fs.c b/engine/common/fs.c
index 48c4531f5..e339116f1 100644
--- a/engine/common/fs.c
+++ b/engine/common/fs.c
@@ -20,7 +20,14 @@
 #define FORWEB(a,b) b
 #endif
 
-
+static char *vidfilenames[] =	//list of filenames to check to see if graphics stuff needs reloading on filesystem changes
+{
+	"gfx.wad",
+	"gfx/conback.lmp"/*q1*/,"gfx/menu/conback.lmp"/*h2*/,"pics/conback.pcx"/*q2*/,	//misc stuff
+	"gfx/palette.lmp", "pics/colormap.pcx",
+	"gfx/conchars.png",	//conchars...
+	"fonts/qfont.kfont", "gfx/mcharset.lmp",	//menu fonts
+};
 
 
 #if !defined(HAVE_LEGACY) || !defined(HAVE_CLIENT)
@@ -38,11 +45,12 @@
 /*quake requires a few settings for compatibility*/
 #define QRPCOMPAT "set cl_cursor_scale 0.2\nset cl_cursor_bias_x 7.5\nset cl_cursor_bias_y 0.8\n"
 #define QUAKESPASMSUCKS "set mod_h2holey_bugged 1\n"
-#define QUAKEOVERRIDES "set sv_listen_nq 2\n set v_gammainverted 1\nset cl_download_mapsrc \"https://maps.quakeworld.nu/all/\"\nset con_stayhidden 0\nset allow_download_pakcontents 2\nset allow_download_refpackages 0\nset r_meshpitch -1\nr_sprite_backfacing 1\nset sv_bigcoords \"\"\nmap_autoopenportals 1\n"  "sv_port "STRINGIFY(PORT_QWSERVER)" "STRINGIFY(PORT_NQSERVER)"\n" ZFIXHACK EZQUAKECOMPETITIVE QUAKESPASMSUCKS
+#define QUAKEOVERRIDES "set sv_listen_nq 2\nset v_gammainverted 1\nset cl_download_mapsrc \"https://maps.quakeworld.nu/all/\"\nset con_stayhidden 0\nset allow_download_pakcontents 2\nset allow_download_refpackages 0\nset r_meshpitch -1\nr_sprite_backfacing 1\nset sv_bigcoords \"\"\nmap_autoopenportals 1\n"  "sv_port "STRINGIFY(PORT_QWSERVER)" "STRINGIFY(PORT_NQSERVER)"\n" ZFIXHACK EZQUAKECOMPETITIVE QUAKESPASMSUCKS
 #define QCFG "//schemes quake qw\n"   QUAKEOVERRIDES "set com_parseutf8 0\n" QRPCOMPAT
+#define EZCFG "//mainconfig config\n" QCFG "fps_preset fast\n"
 #define KEXCFG "//schemes quake_r2\n" QUAKEOVERRIDES "set com_parseutf8 1\nset campaign 0\nset net_enable_dtls 1\nset sv_mintic 0.016666667\nset sv_maxtic $sv_mintic\nset cl_netfps 60\n"
 /*NetQuake reconfiguration, to make certain people feel more at home...*/
-#define NQCFG "//disablehomedir 1\n//mainconfig ftenq\n" QCFG "cfg_save_auto 1\nset pm_bunnyfriction 1\nset sv_nqplayerphysics 1\nset cl_loopbackprotocol auto\ncl_sbar 1\nset plug_sbar 0\nset sv_port "STRINGIFY(PORT_NQSERVER)"\ncl_defaultport "STRINGIFY(PORT_NQSERVER)"\nset m_preset_chosen 1\nset vid_wait 1\nset cl_demoreel 1\n"
+#define NQCFG "//disablehomedir 1\n//mainconfig ftenq\n" QCFG "cfg_save_auto 1\nfps_preset nq\nset cl_loopbackprotocol auto\ncl_sbar 1\nset plug_sbar 0\nset sv_port "STRINGIFY(PORT_NQSERVER)"\ncl_defaultport "STRINGIFY(PORT_NQSERVER)"\nset m_preset_chosen 1\nset vid_wait 1\nset cl_demoreel 1\n"
 #define SPASMCFG NQCFG "fps_preset builtin_spasm\nset cl_demoreel 0\ncl_sbar 2\nset gl_load24bit 1\n"
 #define FITZCFG NQCFG "fps_preset builtin_spasm\ncl_sbar 2\nset gl_load24bit 1\n"
 #define TENEBRAECFG NQCFG "fps_preset builtin_tenebrae\n"
@@ -135,7 +143,9 @@ static const gamemode_info_t gamemode_info[] = {
 	//because we can. 'fps_preset spasm' is hopefully close enough...
 	{"-fitz",		"nq",		QUAKEPROT,				{"id1/pak0.pak","id1/quake.rc"},FITZCFG,{"id1"},									"FauxFitz",							UPDATEURL(Q1)},
 	//because we can
-	{"-tenebrae",	NULL,		QUAKEPROT,			{"tenebrae/Pak0.pak","id1/quake.rc"},TENEBRAECFG,{"id1",		"tenebrae"},			"FauxTenebrae",						UPDATEURL(Q1)},
+	{"-tenebrae",	NULL,		QUAKEPROT,				{"tenebrae/Pak0.pak","id1/quake.rc"},TENEBRAECFG,{"id1",				"tenebrae"},"FauxTenebrae",						UPDATEURL(Q1)},
+	//for the luls
+	{"-ezquake",	"ez",		"FTE-Quake",			{"id1/pak0.pak", "id1/quake.rc"},EZCFG,	{"id1",		"qw",				"*ezquake"},"ezFTE",							UPDATEURL(Q1),	NULL},
 
 #if defined(Q2CLIENT) || defined(Q2SERVER)
 	//list quake2 before q1 missionpacks, to avoid confusion about rogue/pak0.pak
@@ -213,6 +223,7 @@ static unsigned int fs_restarts;
 void *fs_thread_mutex;
 float fs_accessed_time;	//timestamp of read (does not include flocates, which should normally happen via a cache).
 
+static cvar_t fs_hidesyspaths		= CVARFD	("fs_hidesyspaths", IFWEB("0","1"), 0, "0: Show system paths in console prints that might appear in screenshots or video capture.\n1: Replace the start of filenames in console prints with generic prefixes that cannot leak private info like your operating system's user name.");
 static cvar_t com_fs_cache			= CVARFD	("fs_cache", IFMINIMAL("2","1"), CVAR_ARCHIVE, "0: Do individual lookups.\n1: Scan all files for accelerated lookups. This provides a performance boost on windows and avoids case sensitivity issues on linux.\n2: like 1, but don't bother checking for external changes (avoiding the cost of rebuild the cache).");
 static cvar_t fs_noreexec			= CVARD		("fs_noreexec", "0", "Disables automatic re-execing configs on gamedir switches.\nThis means your cvar defaults etc may be from the wrong mod, and cfg_save will leave that stuff corrupted!");
 static cvar_t cfg_reload_on_gamedir = CVAR		("cfg_reload_on_gamedir", "1");
@@ -221,11 +232,8 @@ static cvar_t fs_gamepath			= CVARAFD	("fs_gamepath"/*q3ish*/, "", "fs_gamedir"/
 static cvar_t fs_basepath			= CVARAFD	("fs_basepath"/*q3*/,    "", "fs_basedir"/*q2*/, CVAR_NOUNSAFEEXPAND|CVAR_NOSET|CVAR_NOSAVE, "Provided for Q2/Q3 compat. System path of the base directory.");
 static cvar_t fs_homepath			= CVARAFD	("fs_homepath"/*q3ish*/, "", "fs_homedir"/*q2ish*/, CVAR_NOUNSAFEEXPAND|CVAR_NOSET|CVAR_NOSAVE, "Provided for Q2/Q3 compat. System path of the base directory.");
 static cvar_t dpcompat_ignoremodificationtimes = CVARAFD("fs_packageprioritisation", "1", "dpcompat_ignoremodificationtimes", CVAR_NOUNSAFEEXPAND|CVAR_NOSAVE, "Favours the package that is:\n0: Most recently modified\n1: Is alphabetically last (favour z over a, 9 over 0).");
-#ifdef FTE_TARGET_WEB
-cvar_t	fs_dlURL					= CVARAFD(/*ioq3*/"sv_dlURL", "", /*dp*/"sv_curl_defaulturl", CVAR_SERVERINFO|CVAR_NOSAVE, "Provides clients with an external url from which they can obtain pk3s/packages from an external http server instead of having to download over udp.");
-#else
-cvar_t	fs_dlURL					= CVARAFD(/*ioq3*/"sv_dlURL", "", /*dp*/"sv_curl_defaulturl", CVAR_SERVERINFO|CVAR_ARCHIVE, "Provides clients with an external url from which they can obtain pk3s/packages from an external http server instead of having to download over udp.");
-#endif
+cvar_t	fs_dlURL					= CVARAFD(/*ioq3*/"sv_dlURL", "", /*dp*/"sv_curl_defaulturl", CVAR_SERVERINFO|IFWEB(CVAR_NOSAVE,CVAR_ARCHIVE), "Provides clients with an external url from which they can obtain pk3s/packages from an external http server instead of having to download over udp.");
+cvar_t  cl_download_mapsrc			= CVARFD("cl_download_mapsrc", "", CVAR_ARCHIVE, "Specifies an http location prefix for map downloads. EG: \"http://example.com/path/gamemaps/\"");
 int active_fs_cachetype;
 static int fs_referencetype;
 int fs_finds;
@@ -825,7 +833,7 @@ static qboolean FS_Manifest_ParsePackage(ftemanifest_t *man, int packagetype)
 		{
 mirror:
 			if (mirrors == countof(mirror))
-				Con_Printf("too many mirrors for package %s\n", path);
+				Con_Printf(CON_WARNING"too many mirrors for package %s\n", path);
 			else if (legacyextractname)
 			{
 				if (!strcmp(legacyextractname, "xz") || !strcmp(legacyextractname, "gz"))
@@ -837,7 +845,7 @@ mirror:
 				mirror[mirrors++] = Z_StrDup(a);
 		}
 		else if (man->parsever <= MANIFEST_CURRENTVER)
-			Con_Printf("unknown mirror / property %s for package %s\n", a, path);
+			Con_Printf(CON_WARNING"unknown mirror / property %s for package %s\n", a, path);
 	}
 
 	for (i = 0; i < countof(man->package); i++)
@@ -846,15 +854,23 @@ mirror:
 		{
 			if (packagetype == mdt_singlepackage && (!strchr(path, '/') || strchr(path, ':') || strchr(path, '\\')))
 			{
-				Con_Printf("invalid package path specified in manifest (%s)\n", path);
+				Con_Printf(CON_WARNING"invalid package path specified in manifest (%s)\n", path);
 				break;
 			}
 			if (arch)
 			{
 #ifdef PLATFORM
-				if (Q_strcasecmp(PLATFORM, arch))
+				if (Q_strcasecmp(PLATFORM, arch)
+					&& Q_strcasecmp(PLATFORM"_"ARCH_CPU_POSTFIX, arch)
+#ifdef ARCH_ALTCPU_POSTFIX
+					&& Q_strcasecmp(PLATFORM"_"ARCH_ALTCPU_POSTFIX, arch)
 #endif
+					)
+#endif
+				{
+					Con_Printf(CON_WARNING"package archetecture does not match %s\n", PLATFORM"_"ARCH_CPU_POSTFIX);
 					break;
+				}
 			}
 			man->package[i].type = packagetype;
 			man->package[i].path = Z_StrDup(path);
@@ -871,7 +887,7 @@ mirror:
 		}
 	}
 	if (i == countof(man->package))
-		Con_Printf("Too many packages specified in manifest\n");
+		Con_Printf(CON_WARNING"Too many packages specified in manifest\n");
 	for (j = 0; j < mirrors; j++)
 		Z_Free(mirror[j]);
 	return false;
@@ -882,7 +898,7 @@ qboolean FS_GamedirIsOkay(const char *path)
 	char tmp[MAX_QPATH];
 	if (!*path || strchr(path, '\n') || strchr(path, '\r') || !strcmp(path, ".") || !strcmp(path, "..") || strchr(path, ':') || strchr(path, '/') || strchr(path, '\\') || strchr(path, '$'))
 	{
-		Con_Printf("Illegal path specified: %s\n", path);
+		Con_Printf(CON_WARNING"Illegal path specified: %s\n", path);
 		return false;
 	}
 
@@ -1026,12 +1042,10 @@ static qboolean FS_Manifest_ParseTokens(ftemanifest_t *man)
 		char *arg = Cmd_Argv(1);
 		if (!Q_strcasecmp(arg, "auto"))
 			man->homedirtype = MANIFEST_HOMEDIRWHENREADONLY;
-		else if (!*arg || atoi(arg))
+		else if (!*arg || atoi(arg) || !Q_strcasecmp(arg, "never"))
 			man->homedirtype = MANIFEST_NOHOMEDIR;
 		else if (!atoi(arg) || !Q_strcasecmp(arg, "force") || !Q_strcasecmp(arg, "always"))
 			man->homedirtype = MANIFEST_FORCEHOMEDIR;
-		else if (!Q_strcasecmp(arg, "never"))
-			man->homedirtype = MANIFEST_NOHOMEDIR;
 	}
 	else if (!Q_strcasecmp(cmd, "basegame") || !Q_strcasecmp(cmd, "gamedir"))
 	{
@@ -1341,6 +1355,22 @@ static char *fs_purenames;			//list of allowed packages
 static char *fs_purecrcs;			//list of crcs for those packages. one token per package.
 static unsigned int fs_pureseed;	//used as a key so the server knows we're obeying. completely unreliable/redundant in an open source project, but needed for q3 network compat.
 
+char *FS_AbbreviateSize(char *buf, size_t bufsize, qofs_t fsize)
+{
+	//caps mean kibi instead of kilo, and bytes not bits.
+	if (fsize > 512.0*1024*1024*1024)
+		Q_snprintfz(buf, bufsize, "%gTB", fsize/(1024.0*1024*1024*1024));
+	else if (fsize > 512.0*1024*1024)
+		Q_snprintfz(buf, bufsize, "%gGB", fsize/(1024.0*1024*1024));
+	else if (fsize > 512.0*1024)
+		Q_snprintfz(buf, bufsize, "%gMB", fsize/(1024.0*1024));
+	else if (fsize > 512.0)
+		Q_snprintfz(buf, bufsize, "%gKB", fsize/1024.0);
+	else
+		Q_snprintfz(buf, bufsize, "%"PRIuQOFS"B", fsize);
+	return buf;
+}
+
 int QDECL COM_FileSize(const char *path)
 {
 	flocation_t loc;
@@ -1374,6 +1404,7 @@ COM_Path_f
 */
 static void COM_PathLine(searchpath_t *s)
 {
+	char displaypath[MAX_OSPATH];
 	char *col = "";
 	if (s->flags&SPF_ISDIR)
 		col = S_COLOR_GREEN;
@@ -1381,7 +1412,8 @@ static void COM_PathLine(searchpath_t *s)
 		col = S_COLOR_BLUE;
 	else
 		col = S_COLOR_CYAN;
-	Con_Printf(" %s" U8("%s")"  %s%s%s%s%s%s%s%s\n", col, s->logicalpath,
+	FS_DisplayPath(s->logicalpath, FS_SYSTEM, displaypath,sizeof(displaypath));
+	Con_Printf(" %s" U8("%s")"  %s%s%s%s%s%s%s%s\n", col, displaypath,
 		(s->flags & SPF_REFERENCED)?"^[(ref)\\tip\\Referenced\\desc\\Package will auto-download to clients^]":"",
 		(s->flags & SPF_TEMPORARY)?"^[(temp)\\tip\\Temporary\\desc\\Flushed on map change^]":"",
 		(s->flags & SPF_SERVER)?"^[(srv)\\tip\\Server-Specified\\desc\\Loaded to match the server, closed on disconnect^]":"",
@@ -1389,7 +1421,7 @@ static void COM_PathLine(searchpath_t *s)
 		(s->flags & SPF_EXPLICIT)?"^[(e)\\tip\\Explicit\\desc\\Loaded explicitly by the gamedir^]":"",
 		(s->flags & SPF_UNTRUSTED)?"^[(u)\\tip\\Untrusted\\desc\\Configs and scripts will not be given access to passwords^]":"",
 		(s->flags & SPF_WRITABLE)?"^[(w)\\tip\\Writable\\desc\\We can probably write here^]":"",
-		(s->handle->GeneratePureCRC)?va("^[(h)\\tip\\Hash: %x^]", s->handle->GeneratePureCRC(s->handle, 0, 0)):"");
+		(s->handle->GeneratePureCRC)?va("^[(h)\\tip\\Hash: %x^]", s->crc_check):"");
 }
 qboolean FS_GameIsInitialised(void)
 {
@@ -1464,7 +1496,10 @@ static void COM_Path_f (void)
 			if (!s)
 			{
 				COM_DefaultExtension(nametok, ".pk3", sizeof(nametok));
-				Con_Printf(CON_WARNING "MISSING: " U8("%s")"  (%x)\n", nametok, crc);
+				if (*nametok == '*')
+					Con_Printf(CON_ERROR "MISSING: " U8("%s")"  (%x)\n", nametok+1, crc);
+				else
+					Con_Printf(CON_WARNING "MISSING: " U8("%s")"  (%x)\n", nametok, crc);
 			}
 		}
 	}
@@ -1482,6 +1517,8 @@ static int QDECL COM_Dir_List(const char *name, qofs_t size, time_t mtime, void
 	searchpath_t	*s;
 	const char *ext;
 	char link[512];
+	char pkgname[MAX_OSPATH];
+	char szbuf[16];
 	char *colour;
 	flocation_t loc;
 	for (s=com_searchpaths ; s ; s=s->next)
@@ -1566,21 +1603,24 @@ static int QDECL COM_Dir_List(const char *name, qofs_t size, time_t mtime, void
 	else
 	{
 		char *gah;
+		if (FS_DisplayPath(loc.search->logicalpath, FS_SYSTEM, pkgname,sizeof(pkgname)))
+			;
+		else
+			Q_strncpyz(pkgname, loc.search->purepath, sizeof(pkgname));
+
 		colour = "^1";	//superseeded
-		Q_snprintfz(link, sizeof(link), "\\tip\\overriden by file from %s", loc.search->logicalpath);
+		Q_snprintfz(link, sizeof(link), "\\tip\\overriden by file from %s", pkgname);
 		gah = link + 20;	//whatever
 		while ((gah = strchr(gah, '\\')))
 			*gah = '/';
 	}
 
-	if (size > 1.0*1024*1024*1024)
-		Con_Printf(U8("(%#.3ggb) ^[%s%s%s^] \t^h(%s)\n"), size/(1024.0*1024*1024), colour, name, link, s?s->logicalpath:"??");
-	else if (size > 1.0*1024*1024)
-		Con_Printf(U8("(%#.3gmb) ^[%s%s%s^] \t^h(%s)\n"), size/(1024.0*1024), colour, name, link, s?s->logicalpath:"??");
-	else if (size > 1.0*1024)
-		Con_Printf(U8("(%#.3gkb) ^[%s%s%s^] \t^h(%s)\n"), size/1024.0, colour, name, link, s?s->logicalpath:"??");
+	if (s && FS_DisplayPath(s->logicalpath, FS_SYSTEM, pkgname,sizeof(pkgname)))
+		;
 	else
-		Con_Printf(U8("(%5ub) ^[%s%s%s^] \t^h(%s)\n"), (unsigned int)size, colour, name, link, s?s->logicalpath:"??");
+		Q_strncpyz(pkgname, "??", sizeof(pkgname));
+
+	Con_Printf(U8("(%s) ^[%s%s%s^] \t^h(%s)\n"), FS_AbbreviateSize(szbuf,sizeof(szbuf), size), colour, name, link, pkgname);
 	return 1;
 }
 
@@ -1614,19 +1654,24 @@ COM_Locate_f
 */
 static void COM_Locate_f (void)
 {
+	char pkgname[MAX_OSPATH];
 	flocation_t loc;
 	char *f = Cmd_Argv(1);
 	if (strchr(f, '^'))	//fte's filesystem is assumed to be utf-8, but that doesn't mean that console input is. and I'm too lazy to utf-8ify the string (in part because markup can be used to exploit ascii assumptions).
 		Con_Printf("Warning: filename contains markup. If this is because of unicode, set com_parseutf8 1\n");
 	if (FS_FLocateFile(f, FSLF_IFFOUND, &loc))
 	{
+		if (FS_DisplayPath(loc.search->logicalpath, FS_SYSTEM, pkgname,sizeof(pkgname)))
+			;
+		else
+			Q_strncpyz(pkgname, "??", sizeof(pkgname));
 		if (!*loc.rawname)
 		{
-			Con_Printf("File is %u bytes compressed inside "U8("%s")"\n", (unsigned)loc.len, loc.search->logicalpath);
+			Con_Printf("File is %u bytes compressed inside "U8("%s")"\n", (unsigned)loc.len, pkgname);
 		}
 		else
 		{
-			Con_Printf("Inside "U8("%s")" (%u bytes)\n  "U8("%s")"\n", loc.rawname, (unsigned)loc.len, loc.search->logicalpath);
+			Con_Printf("Inside "U8("%s")" (%u bytes)\n  "U8("%s")"\n", loc.rawname, (unsigned)loc.len, pkgname);
 		}
 	}
 	else
@@ -1692,15 +1737,7 @@ static void COM_CalcHash_Thread(void *ctx, void *fname, size_t a, size_t b)
 
 		VFS_CLOSE(f);
 
-		Con_Printf("%s: ", (char*)fname);
-		if (fsize > 1024*1024*1024*(quint64_t)16)
-			Con_Printf("%g GB\n", fsize/(1024.0*1024*1024));
-		else if (fsize > 1024*1024*16)
-			Con_Printf("%g MB\n", fsize/(1024.0*1024));
-		else if (fsize > 1024*16)
-			Con_Printf("%g KB\n", fsize/(1024.0));
-		else
-			Con_Printf("%u bytes\n", (unsigned)fsize);
+		Con_Printf("%s: %s\n", (char*)fname, FS_AbbreviateSize(block,sizeof(block), fsize));
 		for (h = 0; h < countof(hashes); h++)
 		{
 			hashes[h].hash->terminate(digest, hashes[h].ctx);
@@ -2307,16 +2344,24 @@ const char *FS_WhichPackForLocation(flocation_t *loc, unsigned int flags)
 	return NULL;
 }
 
-/*requires extension*/
-qboolean FS_GetPackageDownloadable(const char *package)
+searchpath_t *FS_GetPackage(const char *package)
 {
 	searchpath_t	*search;
 
 	for (search = com_searchpaths ; search ; search = search->next)
 	{
 		if (!Q_strcasecmp(package, search->purepath))
-			return !(search->flags & SPF_COPYPROTECTED);
+			return search;
 	}
+	return NULL;
+}
+/*requires extension*/
+qboolean FS_GetPackageDownloadable(const char *package)
+{
+	searchpath_t	*search = FS_GetPackage(package);
+
+	if (search)
+		return !(search->flags & SPF_COPYPROTECTED);
 	return false;
 }
 
@@ -2338,8 +2383,6 @@ char *FS_GetPackHashes(char *buffer, int buffersize, qboolean referencedonly)
 	{
 		for (search = com_searchpaths ; search ; search = search->next)
 		{
-			if (!search->crc_check && search->handle->GeneratePureCRC)
-				search->crc_check = search->handle->GeneratePureCRC(search->handle, 0, 0);
 			if (search->crc_check)
 			{
 				Q_strncatz(buffer, va("%i ", search->crc_check), buffersize);
@@ -2387,8 +2430,6 @@ char *FS_GetPackNames(char *buffer, int buffersize, int referencedonly, qboolean
 	{
 		for (search = com_searchpaths ; search ; search = search->next)
 		{
-			if (!search->crc_check && search->handle->GeneratePureCRC)
-				search->crc_check = search->handle->GeneratePureCRC(search->handle, 0, 0);
 			if (search->crc_check)
 			{
 				if (referencedonly == 0 && !(search->flags & SPF_REFERENCED))
@@ -2586,7 +2627,7 @@ static vfsfile_t *VFS_Filter(const char *filename, vfsfile_t *handle)
 	return handle;
 }
 
-qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out, int outlen)
+static qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out, int outlen, qboolean fordisplay)
 {
 	flocation_t loc;
 	int i;
@@ -2595,10 +2636,29 @@ qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out
 	qboolean wasbase;	//to handle out-of-order base/game dirs.
 	int nlen;
 
+	if (!fs_hidesyspaths.ival)
+		fordisplay = false;	//just show system paths
+
 	if (relativeto == FS_SYSTEM)
 	{
-		//system is already the native path. we can just pass it through. perhaps we should clean it up first however, although that's just making sure all \ are /
-		Q_snprintfz(out, outlen, "%s", fname);
+		//system is already the native path. we can just pass it through. perhaps we should clean it up first however, although that's just making sure all \ are /	
+		if (fordisplay)
+		{
+			if (com_homepathenabled && !strncmp(fname, com_homepath, strlen(com_homepath)))	//'FS_HOME'
+				Q_snprintfz(out, outlen, "$homedir/%s", fname+strlen(com_homepath));
+			else if (!strncmp(fname, com_gamepath, strlen(com_gamepath)))					//FS_ROOT-THAT-ISNT-HOME
+				Q_snprintfz(out, outlen, "$basedir/%s", fname+strlen(com_gamepath));
+			else if (host_parms.binarydir && !strncmp(fname, host_parms.binarydir, strlen(host_parms.binarydir)))	//FS_BINARYDIR
+				Q_snprintfz(out, outlen, "$bindir/%s", fname+strlen(host_parms.binarydir));
+#ifdef FTE_LIBRARY_PATH
+			else if (!strncmp(fname, STRINGIFY(FTE_LIBRARY_PATH)"/", strlen(STRINGIFY(FTE_LIBRARY_PATH)"/")))	//FS_LIBRARYDIR
+				Q_snprintfz(out, outlen, "$libdir/%s", fname+strlen(host_parms.binarydir));
+#endif
+			else	//should try bindir
+				Q_snprintfz(out, outlen, "$system/%s", COM_SkipPath(fname));			//FS_SYSTEM :(
+		}
+		else
+			Q_snprintfz(out, outlen, "%s", fname);
 
 		for (; *out; out++)
 		{
@@ -2627,36 +2687,47 @@ qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out
 	case FS_GAME: //this is really for diagnostic type stuff...
 		if (FS_FLocateFile(fname, FSLF_IFFOUND, &loc))
 		{
-			nlen = Q_snprintfz(out, outlen, "%s/%s", loc.search->logicalpath, fname);
+			if (fordisplay)
+			{
+				if (!strncmp(com_homepath, loc.search->logicalpath, strlen(com_homepath)))
+					nlen = Q_snprintfz(out, outlen, "$homedir/%s/%s", loc.search->purepath, fname);
+				else
+					nlen = Q_snprintfz(out, outlen, "$basedir/%s/%s", loc.search->purepath, fname);
+			}
+			else
+				nlen = Q_snprintfz(out, outlen, "%s/%s", loc.search->logicalpath, fname);
 			break;
 		}
 		//fallthrough
 	case FS_GAMEONLY:
 		if (com_homepathenabled)
-			nlen = Q_snprintfz(out, outlen, "%s%s/%s", com_homepath, gamedirfile, fname);
+			nlen = Q_snprintfz(out, outlen, "%s%s/%s", fordisplay?"$homedir/":com_homepath, gamedirfile, fname);
 		else
-			nlen = Q_snprintfz(out, outlen, "%s%s/%s", com_gamepath, gamedirfile, fname);
+			nlen = Q_snprintfz(out, outlen, "%s%s/%s", fordisplay?"$basedir/":com_gamepath, gamedirfile, fname);
 		break;
 	case FS_LIBRARYPATH:
 #ifdef FTE_LIBRARY_PATH
-		nlen = Q_snprintfz(out, outlen, STRINGIFY(FTE_LIBRARY_PATH)"/%s", fname);
+		if (fordisplay)
+			nlen = Q_snprintfz(out, outlen, "$libdir/%s", fname);
+		else
+			nlen = Q_snprintfz(out, outlen, STRINGIFY(FTE_LIBRARY_PATH)"/%s", fname);
 		break;
 #else
 		return false;
 #endif
 	case FS_BINARYPATH:
 		if (host_parms.binarydir && *host_parms.binarydir)
-			nlen = Q_snprintfz(out, outlen, "%s%s", host_parms.binarydir, fname);
+			nlen = Q_snprintfz(out, outlen, "%s%s", fordisplay?"$bindir/":host_parms.binarydir, fname);
 		else
-			nlen = Q_snprintfz(out, outlen, "%s%s", host_parms.basedir, fname);
+			nlen = Q_snprintfz(out, outlen, "%s%s", fordisplay?"$basedir/":host_parms.basedir, fname);
 		break;
 	case FS_ROOT:
 		if (com_installer)
 			return false;
 		if (com_homepathenabled)
-			nlen = Q_snprintfz(out, outlen, "%s%s", com_homepath, fname);
+			nlen = Q_snprintfz(out, outlen, "%s%s", fordisplay?"$homedir/":com_homepath, fname);
 		else
-			nlen = Q_snprintfz(out, outlen, "%s%s", com_gamepath, fname);
+			nlen = Q_snprintfz(out, outlen, "%s%s", fordisplay?"$basedir/":com_gamepath, fname);
 		break;
 
 	case FS_BASEGAMEONLY:	// fte/
@@ -2673,9 +2744,9 @@ qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out
 		if (!last)
 			return false;	//eep?
 		if (com_homepathenabled)
-			nlen = Q_snprintfz(out, outlen, "%s%s/%s", com_homepath, last, fname);
+			nlen = Q_snprintfz(out, outlen, "%s%s/%s", fordisplay?"$homedir/":com_homepath, last, fname);
 		else
-			nlen = Q_snprintfz(out, outlen, "%s%s/%s", com_gamepath, last, fname);
+			nlen = Q_snprintfz(out, outlen, "%s%s/%s", fordisplay?"$basedir/":com_gamepath, last, fname);
 		break;
 	case FS_PUBGAMEONLY:	// $gamedir/ or qw/ but not fte/
 		last = NULL;
@@ -2696,9 +2767,9 @@ qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out
 		if (!last)
 			return false;	//eep?
 		if (com_homepathenabled)
-			nlen = Q_snprintfz(out, outlen, "%s%s/%s", com_homepath, last, fname);
+			nlen = Q_snprintfz(out, outlen, "%s%s/%s", fordisplay?"$homedir/":com_homepath, last, fname);
 		else
-			nlen = Q_snprintfz(out, outlen, "%s%s/%s", com_gamepath, last, fname);
+			nlen = Q_snprintfz(out, outlen, "%s%s/%s", fordisplay?"$basedir/":com_gamepath, last, fname);
 		break;
 	case FS_PUBBASEGAMEONLY:	// qw/ (fixme: should be the last non-private basedir)
 		last = NULL;
@@ -2714,9 +2785,9 @@ qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out
 		if (!last)
 			return false;	//eep?
 		if (com_homepathenabled)
-			nlen = Q_snprintfz(out, outlen, "%s%s/%s", com_homepath, last, fname);
+			nlen = Q_snprintfz(out, outlen, "%s%s/%s", fordisplay?"$homedir/":com_homepath, last, fname);
 		else
-			nlen = Q_snprintfz(out, outlen, "%s%s/%s", com_gamepath, last, fname);
+			nlen = Q_snprintfz(out, outlen, "%s%s/%s", fordisplay?"$basedir/":com_gamepath, last, fname);
 		break;
 	default:
 		Sys_Error("FS_NativePath case not handled\n");
@@ -2724,6 +2795,17 @@ qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out
 	return nlen < outlen;
 }
 
+qboolean FS_SystemPath(const char *fname, enum fs_relative relativeto, char *out, int outlen)
+{
+	return FS_NativePath(fname, relativeto, out, outlen, false);
+}
+qboolean FS_DisplayPath(const char *fname, enum fs_relative relativeto, char *out, int outlen)
+{
+	if (outlen)
+		*out = 0;
+	return FS_NativePath(fname, relativeto, out, outlen, true);
+}
+
 //returns false to stop the enumeration. check the return value of the fs enumerator to see if it was canceled by this return value.
 static int QDECL FS_NullFSEnumerator(const char *fname, qofs_t fsize, time_t mtime, void *parm, searchpathfuncs_t *spath)
 {
@@ -2731,7 +2813,7 @@ static int QDECL FS_NullFSEnumerator(const char *fname, qofs_t fsize, time_t mti
 }
 
 //opens a file in the same (writable) path that contains an existing version of the file or one of the other patterns listed
-vfsfile_t *FS_OpenWithFriends(const char *fname, char *sysname, size_t sysnamesize, int numfriends, ...)
+vfsfile_t *FS_OpenWithFriends(const char *fname, char *displayname, size_t displaynamesize, int numfriends, ...)
 {
 	searchpath_t *search;
 	searchpath_t *lastwritable = NULL;
@@ -2764,16 +2846,29 @@ vfsfile_t *FS_OpenWithFriends(const char *fname, char *sysname, size_t sysnamesi
 	}
 	if (lastwritable)
 	{
+		char sysname[MAX_OSPATH];
+		vfsfile_t *f;
 		//figure out the system path
-		Q_strncpyz(sysname, lastwritable->logicalpath, sysnamesize);
-		FS_CleanDir(sysname, sysnamesize);
-		Q_strncatz(sysname, fname, sysnamesize);
+		Q_strncpyz(sysname, lastwritable->logicalpath, sizeof(sysname));
+		FS_CleanDir(sysname, sizeof(sysname));
+		Q_strncatz(sysname, fname, sizeof(sysname));
 
 		//create the dir if needed and open the file.
 		COM_CreatePath(sysname);
-		return VFSOS_Open(sysname, "wbp");
+		f = VFSOS_Open(sysname, "wbp");
+
+		if (fs_hidesyspaths.ival)
+		{
+			if (*com_homepath && !strncmp(com_homepath, lastwritable->logicalpath, strlen(com_homepath)))
+				Q_snprintfz(displayname, displaynamesize, "$homedir/%s/%s", lastwritable->purepath, fname);
+			else
+				Q_snprintfz(displayname, displaynamesize, "$basedir/%s/%s", lastwritable->purepath, fname);
+		}
+		else
+			Q_strncpyz(displayname, sysname, displaynamesize);
+		return f;
 	}
-	FS_NativePath(fname, FS_GAMEONLY, sysname, sysnamesize);
+	FS_DisplayPath(fname, FS_GAMEONLY, displayname, displaynamesize);
 	return NULL;
 }
 
@@ -2900,18 +2995,18 @@ vfsfile_t *QDECL FS_OpenVFS(const char *filename, const char *mode, enum fs_rela
 	case FS_PUBGAMEONLY:		//used for $gamedir/downloads
 	case FS_BASEGAMEONLY:		//used for fte/configs/*
 	case FS_PUBBASEGAMEONLY:	//used for qw/skins/*
-		if (!FS_NativePath(filename, relativeto, fullname, sizeof(fullname)))
+		if (!FS_SystemPath(filename, relativeto, fullname, sizeof(fullname)))
 			return NULL;
 		if (*mode == 'w')
 			COM_CreatePath(fullname);
 		return VFSOS_Open(fullname, mode);
 	case FS_GAME:	//load from paks in preference to system paths. overwriting be damned.
-		if (!FS_NativePath(filename, relativeto, fullname, sizeof(fullname)))
+		if (!FS_SystemPath(filename, relativeto, fullname, sizeof(fullname)))
 			return NULL;
 		break;
 	case FS_LIBRARYPATH:
 	case FS_BINARYPATH:
-		if (!FS_NativePath(filename, relativeto, fullname, sizeof(fullname)))
+		if (!FS_SystemPath(filename, relativeto, fullname, sizeof(fullname)))
 			return NULL;
 		if (*mode == 'w')
 			COM_CreatePath(fullname);
@@ -2978,9 +3073,9 @@ qboolean FS_Rename2(const char *oldf, const char *newf, enum fs_relative oldrela
 	char oldfullname[MAX_OSPATH];
 	char newfullname[MAX_OSPATH];
 
-	if (!FS_NativePath(oldf, oldrelativeto, oldfullname, sizeof(oldfullname)))
+	if (!FS_SystemPath(oldf, oldrelativeto, oldfullname, sizeof(oldfullname)))
 		return false;
-	if (!FS_NativePath(newf, newrelativeto, newfullname, sizeof(newfullname)))
+	if (!FS_SystemPath(newf, newrelativeto, newfullname, sizeof(newfullname)))
 		return false;
 
 	FS_CreatePath(newf, newrelativeto);
@@ -3009,7 +3104,7 @@ qboolean FS_Remove(const char *fname, enum fs_relative relativeto)
 {
 	char fullname[MAX_OSPATH];
 
-	if (!FS_NativePath(fname, relativeto, fullname, sizeof(fullname)))
+	if (!FS_SystemPath(fname, relativeto, fullname, sizeof(fullname)))
 		return false;
 
 	if (Sys_remove (fullname))
@@ -3063,7 +3158,7 @@ qboolean FS_RemoveTree(searchpathfuncs_t *pathhandle, const char *fname)
 void FS_CreatePath(const char *pname, enum fs_relative relativeto)
 {
 	char fullname[MAX_OSPATH];
-	if (!FS_NativePath(pname, relativeto, fullname, sizeof(fullname)))
+	if (!FS_SystemPath(pname, relativeto, fullname, sizeof(fullname)))
 		return;
 
 	COM_CreatePath(fullname);
@@ -3103,7 +3198,7 @@ qboolean FS_WriteFile (const char *filename, const void *data, int len, enum fs_
 {
 	vfsfile_t *f;
 	FS_CreatePath(filename, relativeto);
-	f = FS_OpenVFS(filename, "wb", relativeto);
+	f = FS_OpenVFS(filename, "wbp", relativeto);
 	if (!f)
 		return false;
 	VFS_WRITE(f, data, len);
@@ -3768,7 +3863,7 @@ searchpathfuncs_t *FS_OpenPackByExtension(vfsfile_t *f, searchpathfuncs_t *paren
 	{
 		if (!searchpathformats[j].extension || !searchpathformats[j].OpenNew)
 			continue;
-		if (!strcmp(ext, searchpathformats[j].extension))
+		if (!Q_strcasecmp(ext, searchpathformats[j].extension))
 		{
 			pak = searchpathformats[j].OpenNew(f, parent, filename, pakname, pakpathprefix);
 			if (pak)
@@ -3810,8 +3905,8 @@ void FS_AddHashedPackage(searchpath_t **oldpaths, const char *parentpath, const
 				return;	//file name was invalid, panic.
 			if (!search)
 			{
-				FS_NativePath(pname, FS_ROOT, lname, sizeof(lname));
-				FS_NativePath(pakpath, FS_ROOT, lname2, sizeof(lname2));
+				FS_SystemPath(pname, FS_ROOT, lname, sizeof(lname));
+				FS_SystemPath(pakpath, FS_ROOT, lname2, sizeof(lname2));
 			}
 			else
 			{
@@ -3874,7 +3969,7 @@ void FS_AddHashedPackage(searchpath_t **oldpaths, const char *parentpath, const
 				//insert it into our path lists.
 				if (handle && qhash)
 				{
-					int truecrc = handle->GeneratePureCRC(handle, 0, false);
+					int truecrc = handle->GeneratePureCRC(handle, NULL);
 					if (truecrc != (int)strtoul(qhash, NULL, 0))
 					{
 						if (pakprefix && *pakprefix)
@@ -3925,7 +4020,7 @@ static void FS_AddManifestPackages(searchpath_t **oldpaths, const char *purepath
 static void FS_AddDownloadManifestPackages(searchpath_t **oldpaths, unsigned int loadstuff)//, const char *purepath, searchpath_t *search, const char *extension, searchpathfuncs_t *(QDECL *OpenNew)(vfsfile_t *file, const char *desc))
 {
 	char logicalroot[MAX_OSPATH];
-	FS_NativePath("downloads/", FS_ROOT, logicalroot, sizeof(logicalroot));
+	FS_SystemPath("downloads/", FS_ROOT, logicalroot, sizeof(logicalroot));
 
 	FS_AddManifestPackages(oldpaths, "downloads", logicalroot, NULL, loadstuff);
 }
@@ -3977,7 +4072,7 @@ static void FS_AddDataFiles(searchpath_t **oldpaths, const char *purepath, const
 				{
 					if (!searchpathformats[j].extension || !searchpathformats[j].OpenNew || !searchpathformats[j].loadscan)
 						continue;
-					if (!stricmp(extension, searchpathformats[j].extension))
+					if (!Q_strcasecmp(extension, searchpathformats[j].extension))
 					{
 						if (loadstuff & (1<<j))
 						{
@@ -4107,12 +4202,27 @@ static searchpath_t *FS_AddPathHandle(searchpath_t **oldpaths, const char *purep
 	}
 	search->flags = flags;
 
+	search->crc_check = 0;
+	search->crc_seed = ~fs_pureseed;
+	search->crc_reply = 0;
+	if (search->handle->GeneratePureCRC)
+	{
+		search->crc_check = search->handle->GeneratePureCRC(search->handle, NULL);
+		if (flags & SPF_SERVER)
+		{
+			search->crc_seed = fs_pureseed;
+			search->crc_reply = search->handle->GeneratePureCRC(search->handle, &search->crc_seed);
+		}
+	}
+
 	flags &= ~SPF_WRITABLE;
 
 	//temp packages also do not nest
 	if (!(flags & SPF_TEMPORARY))
 		FS_AddDataFiles(oldpaths, purepath, logicalpath, search, flags&(SPF_COPYPROTECTED|SPF_UNTRUSTED|SPF_TEMPORARY|SPF_SERVER|SPF_PRIVATE|SPF_QSHACK), loadstuff);
 
+	search->nextpure = (void*)0x1;	//mark as not linked
+
 	if (flags & (SPF_TEMPORARY|SPF_SERVER))
 	{
 		//add at end. pureness will reorder if needed.
@@ -4623,7 +4733,7 @@ qboolean FS_LoadPackageFromFile(vfsfile_t *vfs, char *pname, char *localname, in
 	{
 		if (!searchpathformats[i].extension || !searchpathformats[i].OpenNew)
 			continue;
-		if (!strcmp(ext, searchpathformats[i].extension))
+		if (!Q_strcasecmp(ext, searchpathformats[i].extension))
 		{
 			handle = searchpathformats[i].OpenNew (vfs, localname);
 			if (!handle)
@@ -4701,7 +4811,7 @@ vfsfile_t *CL_OpenFileInPackage(searchpathfuncs_t *search, char *name)
 			{
 				if (!searchpathformats[i].extension || !searchpathformats[i].OpenNew)
 					continue;
-				if (!strcmp(ext, searchpathformats[i].extension))
+				if (!Q_strcasecmp(ext, searchpathformats[i].extension))
 				{
 					loc.search = NULL;
 					if (search)
@@ -4798,7 +4908,7 @@ qboolean CL_ListFilesInPackage(searchpathfuncs_t *search, char *name, int (QDECL
 		{
 			if (!searchpathformats[i].extension || !searchpathformats[i].OpenNew)
 				continue;
-			if (!strcmp(ext, searchpathformats[i].extension))
+			if (!Q_strcasecmp(ext, searchpathformats[i].extension))
 			{
 				loc.search = NULL;
 				if (search)
@@ -5204,8 +5314,11 @@ static void FS_ReloadPackFilesFlags(unsigned int reloadflags)
 			if (sp->handle->GeneratePureCRC)
 			{
 				sp->nextpure = (void*)0x1;
-				sp->crc_check = sp->handle->GeneratePureCRC(sp->handle, fs_pureseed, 0);
-				sp->crc_reply = sp->handle->GeneratePureCRC(sp->handle, fs_pureseed, 1);
+				if (sp->crc_seed != fs_pureseed)
+				{
+					sp->crc_seed = fs_pureseed;
+					sp->crc_reply = sp->handle->GeneratePureCRC(sp->handle, &sp->crc_seed);
+				}
 			}
 			else
 			{
@@ -5281,26 +5394,23 @@ static void FS_ReloadPackFilesFlags(unsigned int reloadflags)
 			if (!sp && *pname)
 			{
 				char local[MAX_OSPATH];
+				char rlocal[MAX_OSPATH];
 				vfsfile_t *vfs;
 				char ext[8];
 				void *handle;
 				int i;
 				COM_FileExtension(pname, ext, sizeof(ext));
 
-				if (FS_GenCachedPakName(pname, crctok, local, sizeof(local)))
+				if (FS_GenCachedPakName(pname, crctok, rlocal, sizeof(rlocal)) && FS_SystemPath(rlocal, FS_ROOT, local, sizeof(local)))
 				{
 					unsigned int keptflags;
+
 					handle = FS_GetOldPath(&oldpaths, local, &keptflags);
 					if (handle)
 					{
 						sp = FS_AddPathHandle(&oldpaths, pname, local, handle, "", SPF_COPYPROTECTED|SPF_UNTRUSTED|SPF_SERVER|keptflags, (unsigned int)-1);
 						if (!sp)
 							continue;	//some kind of error...
-						if (sp->handle->GeneratePureCRC)
-						{
-							sp->crc_check = sp->handle->GeneratePureCRC(sp->handle, fs_pureseed, 0);
-							sp->crc_reply = sp->handle->GeneratePureCRC(sp->handle, fs_pureseed, 1);
-						}
 						if ((*crctok && sp->crc_check == crc) || !*crctok)
 						{
 							if (fs_puremode)
@@ -5316,7 +5426,7 @@ static void FS_ReloadPackFilesFlags(unsigned int reloadflags)
 						//else crc mismatched...
 						continue;
 					}
-					vfs = FS_OpenVFS(local, "rb", FS_ROOT);
+					vfs = FS_OpenVFS(rlocal, "rb", FS_ROOT);
 				}
 				else
 					vfs = NULL;
@@ -5326,17 +5436,12 @@ static void FS_ReloadPackFilesFlags(unsigned int reloadflags)
 					{
 						if (!searchpathformats[i].extension || !searchpathformats[i].OpenNew)
 							continue;
-						if (!strcmp(ext, searchpathformats[i].extension))
+						if (!Q_strcasecmp(ext, searchpathformats[i].extension))
 						{
 							handle = searchpathformats[i].OpenNew (vfs, NULL, local, local, "");
 							if (!handle)
 								break;
 							sp = FS_AddPathHandle(&oldpaths, pname, local, handle, "", SPF_COPYPROTECTED|SPF_UNTRUSTED|SPF_SERVER, (unsigned int)-1);
-							if (sp->handle->GeneratePureCRC)
-							{
-								sp->crc_check = sp->handle->GeneratePureCRC(sp->handle, fs_pureseed, 0);
-								sp->crc_reply = sp->handle->GeneratePureCRC(sp->handle, fs_pureseed, 1);
-							}
 
 							if ((*crctok && sp->crc_check == crc) || !*crctok)
 							{
@@ -5356,7 +5461,7 @@ static void FS_ReloadPackFilesFlags(unsigned int reloadflags)
 				}
 
 				if (!sp)
-					Con_DPrintf("Pure package %s:%08x wasn't found\n", pname, crc);
+					Con_DPrintf(CON_ERROR"Pure package %s:%08x wasn't found\n", pname, crc);
 			}
 		}
 	}
@@ -5408,9 +5513,22 @@ void FS_UnloadPackFiles(void)
 void FS_ReloadPackFiles(void)
 {
 	//extra junk is to ensure the palette is reloaded if that changed.
-	flocation_t paletteloc = {NULL};
-	flocation_t paletteloc2 = {NULL};
-	FS_FLocateFile("gfx/palette.lmp", 0, &paletteloc);
+	flocation_t oldloc[countof(vidfilenames)];
+	flocation_t newloc = {NULL};
+	size_t i;
+
+	if (!FS_GameIsInitialised())
+	{
+		ftemanifest_t *man = FS_ReadDefaultManifest(com_gamepath, 0, true);
+		if (man)
+		{
+			FS_ChangeGame(man, true, false);
+			return;
+		}
+	}
+
+	for (i = 0; i < countof(vidfilenames); i++)
+		FS_FLocateFile(vidfilenames[i], 0, &oldloc[i]);
 
 	if (Sys_LockMutex(fs_thread_mutex))
 	{
@@ -5418,9 +5536,15 @@ void FS_ReloadPackFiles(void)
 		Sys_UnlockMutex(fs_thread_mutex);
 	}
 
-	FS_FLocateFile("gfx/palette.lmp", 0, &paletteloc2);
-	if (paletteloc.search != paletteloc2.search)
-		Cbuf_AddText("vid_reload\n", RESTRICT_LOCAL);
+	for (i = 0; i < countof(vidfilenames); i++)
+	{
+		FS_FLocateFile(vidfilenames[i], 0, &newloc);
+		if (oldloc[i].search != newloc.search)
+		{	//okay, so this file changed... reload the video stuff
+			Cbuf_AddText("vid_reload\n", RESTRICT_LOCAL);
+			break;
+		}
+	}
 }
 
 static void FS_ReloadPackFiles_f(void)
@@ -5953,13 +6077,11 @@ qboolean FS_DirHasAPackage(char *basedir, ftemanifest_t *man)
 	return defaultret;
 }
 
-#if defined(_WIN32) || defined(NOSTDIO) || !defined(_POSIX_C_SOURCE)
 //false stops the search (and returns that value to FS_DirHasGame)
 static int QDECL FS_DirDoesHaveGame(const char *fname, qofs_t fsize, time_t modtime, void *ctx, searchpathfuncs_t *subdir)
 {
 	return false;
 }
-#endif
 
 //just check each possible file, see if one is there.
 static qboolean FS_DirHasGame(const char *basedir, int gameidx)
@@ -5969,6 +6091,7 @@ static qboolean FS_DirHasGame(const char *basedir, int gameidx)
 #else
 	char realpath[MAX_OSPATH];
 #endif
+	char cached[MAX_OSPATH];
 
 	//none listed, just assume its correct.
 	if (!gamemode_info[gameidx].auniquefile[0])
@@ -5985,6 +6108,14 @@ static qboolean FS_DirHasGame(const char *basedir, int gameidx)
 		if (FS_FixupFileCase(realpath, sizeof(realpath), basedir, gamemode_info[gameidx].auniquefile[j], false) && access(realpath, R_OK) == 0)
 			return true;	//something readable.
 #endif
+
+		//gah, just try a wildcard for hashes.
+		if (FS_GenCachedPakName(gamemode_info[gameidx].auniquefile[j], NULL, cached,sizeof(cached)))
+		{
+			Q_strncatz(cached, ".*", sizeof(cached));
+			if (!Sys_EnumerateFiles(basedir, cached, FS_DirDoesHaveGame, NULL, NULL))
+				return true;	//search was cancelled by the callback, so it actually got called.
+		}
 	}
 	return false;
 }
@@ -6166,33 +6297,6 @@ qboolean FS_DownloadingPackage(void)
 	return !fs_manifest || !!curpackagedownload;
 }
 
-static void FS_ManifestUpdated(struct dl_download *dl);
-static void FS_BeginNextPackageDownload(ftemanifest_t *man)
-{
-	if (curpackagedownload || !man || com_installer)
-		return;
-
-	if (man == fs_manifest && man->updateurl && !man->blockupdate)
-	{
-		vfsfile_t *f = man->filename?FS_OpenVFS(man->filename, "ab", FS_SYSTEM):NULL;	//this is JUST to make sure its writable. don't bother updating it if it isn't.
-		man->blockupdate = true;
-		if (f)
-		{
-			VFS_CLOSE(f);
-
-			Con_Printf("Updating manifest from %s\n", man->updateurl);
-			waitingformanifest++;
-			curpackagedownload = HTTP_CL_Get(man->updateurl, NULL, FS_ManifestUpdated);
-			if (curpackagedownload)
-			{
-				curpackagedownload->user_ctx = man;
-				return;
-			}
-		}
-	}
-
-	PM_AddManifestPackages(man);
-}
 static void FS_ManifestUpdated(struct dl_download *dl)
 {
 	ftemanifest_t *man = fs_manifest;
@@ -6215,8 +6319,22 @@ static void FS_ManifestUpdated(struct dl_download *dl)
 				{
 					//the updateurl MUST match the current one in order for the local version of the manifest to be saved (to avoid extra updates, and so it appears in the menu_mods)
 					//this is a paranoia measure to avoid too much damage from buggy/malicious proxies that return empty pages or whatever.
-					if (man->updateurl && fs_manifest->updateurl && !strcmp(man->updateurl, fs_manifest->updateurl) &&
-						man->basedir && fs_manifest->basedir && !strcmp(man->basedir, fs_manifest->basedir))	//basedir must match too... ie: not be overridden.
+					if (!man->updateurl || !fs_manifest->updateurl || strcmp(man->updateurl, fs_manifest->updateurl))
+					{
+						Con_Printf("Refusing to update manifest - updateurl changed from \"%s\" to \"%s\"\n", fs_manifest->updateurl, man->updateurl);
+						FS_Manifest_Free(man);
+					}
+					else if (!man->basedir || !fs_manifest->basedir || strcmp(man->basedir, fs_manifest->basedir))	//basedir must match too... ie: not be overridden.
+					{
+						Con_Printf("Refusing to update manifest - basedir changed from \"%s\" to \"%s\"\n", fs_manifest->basedir, man->basedir);
+						FS_Manifest_Free(man);
+					}
+					else if (!man->installation || !fs_manifest->installation || strcmp(man->installation, fs_manifest->installation))
+					{
+						Con_Printf("Refusing to update manifest - game changed from \"%s\" to \"%s\"\n", fs_manifest->installation, man->installation);
+						FS_Manifest_Free(man);
+					}
+					else
 					{
 						man->blockupdate = true;	//don't download it multiple times. that's just crazy.
 						if (man->filename)
@@ -6250,8 +6368,6 @@ static void FS_ManifestUpdated(struct dl_download *dl)
 						if (man)
 							FS_ChangeGame(man, true, false);
 					}
-					else
-						FS_Manifest_Free(man);
 				}
 				BZ_Free(fdata);
 			}
@@ -6260,8 +6376,32 @@ static void FS_ManifestUpdated(struct dl_download *dl)
 		VFS_CLOSE(dl->file);
 		dl->file = NULL;
 	}
+	if (!waitingformanifest)
+		PM_AddManifestPackages(man, true);
+}
+static void FS_BeginNextPackageDownload(ftemanifest_t *man)
+{
+	if (curpackagedownload || !man || com_installer)
+		return;
 
-	FS_BeginNextPackageDownload(fs_manifest);
+	if (man == fs_manifest && man->updateurl && !man->blockupdate)
+	{
+		vfsfile_t *f = man->filename?FS_OpenVFS(man->filename, "ab", FS_SYSTEM):NULL;	//this is JUST to make sure its writable. don't bother updating it if it isn't.
+		man->blockupdate = true;
+		if (f)
+		{
+			VFS_CLOSE(f);
+
+			Con_Printf("Updating manifest from %s\n", man->updateurl);
+			waitingformanifest++;
+			curpackagedownload = HTTP_CL_Get(man->updateurl, NULL, FS_ManifestUpdated);
+			if (curpackagedownload)
+			{
+				curpackagedownload->user_ctx = man;
+				return;
+			}
+		}
+	}
 }
 void FS_BeginManifestUpdates(void)
 {
@@ -6427,11 +6567,15 @@ qboolean FS_ChangeGame(ftemanifest_t *man, qboolean allowreloadconfigs, qboolean
 	qboolean fixedbasedir;
 	qboolean reloadconfigs = false;
 	qboolean builtingame = false;
+	qboolean basedirchanged = false;
 	flocation_t loc;
+#ifdef MANIFESTDOWNLOADS
+	qboolean allowdownload = man!=fs_manifest && allowreloadconfigs;	//or at least ask the user.
+#endif
 
 #ifdef HAVE_CLIENT
 	qboolean allowvidrestart = true;
-	char *vidfile[] = {"gfx.wad", "gfx/conback.lmp",	//misc stuff
+	char *vidfile[] = {"gfx.wad", "gfx/conback.lmp"/*q1*/,"gfx/menu/conback.lmp"/*h2*/,"pics/conback.pcx"/*q2*/,	//misc stuff
 		"gfx/palette.lmp", "pics/colormap.pcx", "gfx/conchars.png"};		//palettes
 	searchpathfuncs_t *vidpath[countof(vidfile)];
 	char *menufile[] = {"menu.dat"/*mods*/, "gfx/ttl_main.lmp"/*q1*/, "pics/m_main_quit.pcx"/*q2*/, "gfx/menu/title0.lmp"/*h2*/};
@@ -6509,7 +6653,7 @@ qboolean FS_ChangeGame(ftemanifest_t *man, qboolean allowreloadconfigs, qboolean
 
 		if (!man)
 		{
-			found = FS_EnumerateKnownGames(FS_FoundManifest, &man);
+			found = FS_EnumerateKnownGames(FS_FoundManifest, &man, fixedbasedir);
 			if (found != 1)
 			{
 				//we found more than 1 (or none)
@@ -6680,7 +6824,10 @@ qboolean FS_ChangeGame(ftemanifest_t *man, qboolean allowreloadconfigs, qboolean
 	if (!fixedbasedir && !com_installer)
 	{
 		if (strcmp(com_gamepath, newbasedir))
+		{
 			Q_strncpyz (com_gamepath, newbasedir, sizeof(com_gamepath));
+			basedirchanged = true;
+		}
 	}
 
 	//now that we know what we're running and where we're running it, we can switch to it.
@@ -6691,7 +6838,10 @@ qboolean FS_ChangeGame(ftemanifest_t *man, qboolean allowreloadconfigs, qboolean
 	else if (!fs_manifest || !strcmp(fs_manifest->installation?fs_manifest->installation:"", man->installation?man->installation:""))
 	{
 		if (!fs_manifest)
+		{
+			basedirchanged = true;
 			reloadconfigs = true;
+		}
 		FS_Manifest_Free(fs_manifest);
 	}
 	else
@@ -6705,7 +6855,8 @@ qboolean FS_ChangeGame(ftemanifest_t *man, qboolean allowreloadconfigs, qboolean
 
 
 #ifdef PACKAGEMANAGER
-	PM_ManifestChanged(man);
+	if (basedirchanged)
+		PM_ManifestChanged(man);
 
 	if (man->security == MANIFEST_SECURITY_NOT && strcmp(man->downloadsurl?man->downloadsurl:"", olddownloadsurl?olddownloadsurl:""))
 	{	//make sure we only fuck over the user if this is a 'secure' manifest, and not hacked in some way.
@@ -6714,6 +6865,8 @@ qboolean FS_ChangeGame(ftemanifest_t *man, qboolean allowreloadconfigs, qboolean
 	}
 	else
 		Z_Free(olddownloadsurl);
+#else
+	(void)basedirchanged;
 #endif
 
 	//make sure it has a trailing slash, or is empty. woo.
@@ -6758,7 +6911,7 @@ qboolean FS_ChangeGame(ftemanifest_t *man, qboolean allowreloadconfigs, qboolean
 	//our basic filesystem should be okay, but no packages loaded yet.
 #ifdef MANIFESTDOWNLOADS
 	//make sure the package manager knows what its meant to know...
-	PM_AddManifestPackages(man);
+	PM_AddManifestPackages(man, allowdownload);
 #endif
 
 	if (Sys_LockMutex(fs_thread_mutex))
@@ -6977,7 +7130,9 @@ static int QDECL FS_EnumeratedFMF(const char *fname, qofs_t fsize, time_t mtime,
 
 	if (man)
 	{
-		if (e->callback(e->usr, man, e->sourcetype))
+		if (!e->anygamedir && man->basedir && strcmp(man->basedir, com_gamepath))
+			FS_Manifest_Free(man);
+		else if (e->callback(e->usr, man, e->sourcetype))
 			e->found++;
 		else
 			FS_Manifest_Free(man);
@@ -6987,13 +7142,13 @@ static int QDECL FS_EnumeratedFMF(const char *fname, qofs_t fsize, time_t mtime,
 }
 
 //callback must call FS_Manifest_Free or return false.
-int FS_EnumerateKnownGames(qboolean (*callback)(void *usr, ftemanifest_t *man, enum modsourcetype_e sourcetype), void *usr)
+int FS_EnumerateKnownGames(qboolean (*callback)(void *usr, ftemanifest_t *man, enum modsourcetype_e sourcetype), void *usr, qboolean fixedbasedir)
 {
 	int i;
 	char basedir[MAX_OSPATH];
 	fmfenums_t e;
 	ftemanifest_t *man;
-	e.anygamedir = !fs_manifest || !*fs_manifest->installation;
+	e.anygamedir = (!fs_manifest || !*fs_manifest->installation) && !fixedbasedir;
 	e.found = 0;
 	e.callback = callback;
 	e.usr = usr;
@@ -7022,7 +7177,7 @@ int FS_EnumerateKnownGames(qboolean (*callback)(void *usr, ftemanifest_t *man, e
 		Sys_EnumerateFiles(com_homepath, "*.fmf", FS_EnumeratedFMF, &e, NULL);
 	}
 
-	if (e.anygamedir)
+//	if (e.anygamedir)
 	{
 #ifdef __unix__
 		const char *dirs = getenv("XDG_CONFIG_DIRS");
@@ -7224,7 +7379,10 @@ static qboolean Mods_AddManifest(void *usr, ftemanifest_t *man, enum modsourcety
 		//note that intrinsics are ignored entirely if someone took the time to make any other kind of fmf for that basedir.
 		for (p = 0; p < nummods; p++)
 		{
-			if (modlist[p].manifest && !strcmp(modlist[p].manifest->basedir?:"", man->basedir?:"") && !strcmp(modlist[p].manifest->mainconfig?:"", man->mainconfig?:"") && ((modlist[p].sourcetype!=MST_INTRINSIC&&sourcetype==MST_INTRINSIC) || !Q_strcasecmp(modlist[p].manifest->installation, man->installation)))
+			if (	modlist[p].manifest &&
+					!strcmp(modlist[p].manifest->basedir?modlist[p].manifest->basedir:"", man->basedir?man->basedir:"") &&
+					!strcmp(modlist[p].manifest->mainconfig?modlist[p].manifest->mainconfig:"", man->mainconfig?man->mainconfig:"") &&
+					((modlist[p].sourcetype!=MST_INTRINSIC&&sourcetype==MST_INTRINSIC) || !Q_strcasecmp(modlist[p].manifest->installation, man->installation)))
 				return false;
 		}
 		break;
@@ -7258,7 +7416,7 @@ static qboolean Mods_AddManifest(void *usr, ftemanifest_t *man, enum modsourcety
 static int Mods_WasPackageOrDatFound(const char *fname, qofs_t ofs, time_t modtime, void *usr, searchpathfuncs_t *spath)
 {	//we check for *.dat too, because we care about [qw]progs.dat/menu.dat/csprogs.dat or possibly addons. hopefully we can get away with such a generic extension.
 	const char *ext = COM_GetFileExtension(fname, NULL);
-	if (!strcasecmp(ext, ".pk3") || !strcasecmp(ext, ".pak") || !strcasecmp(ext, ".dat"))
+	if (!Q_strcasecmp(ext, ".pk3") || !Q_strcasecmp(ext, ".pak") || !Q_strcasecmp(ext, ".dat"))
 		return false;	//found one, can stop searching now
 	//FIXME: pk3dir
 	return true;	//keep looking for one
@@ -7266,8 +7424,11 @@ static int Mods_WasPackageOrDatFound(const char *fname, qofs_t ofs, time_t modti
 static int Mods_WasMapFound(const char *fname, qofs_t ofs, time_t modtime, void *usr, searchpathfuncs_t *spath)
 {
 	const char *ext = COM_GetFileExtension(fname, NULL);
+	if (!Q_strcasecmp(ext, ".gz"))
+		ext = COM_GetFileExtension(fname, ext);
 	//don't bother looking for .map
-	if (!strcasecmp(ext, ".bsp") || !strcasecmp(ext, ".hmp"))
+	if (!Q_strcasecmp(ext, ".bsp"   ) || !Q_strcasecmp(ext, ".hmp"   ) ||
+		!Q_strcasecmp(ext, ".bsp.gz") || !Q_strcasecmp(ext, ".hmp.gz"))
 		return false;	//found one, can stop searching now
 	return true;	//keep looking for one
 }
@@ -7371,7 +7532,7 @@ struct modlist_s *Mods_GetMod(size_t diridx)
 	{
 		int mancount;
 		modsinited = true;
-		FS_EnumerateKnownGames(Mods_AddManifest, NULL);
+		FS_EnumerateKnownGames(Mods_AddManifest, NULL, true);
 		mancount = nummods;
 		if (*fs_manifest->installation)
 		{
@@ -7447,7 +7608,7 @@ static void FS_ModInstall(const char *dest, const char *url)
 	ftemanifest_t *man = NULL;
 
 	//find out a writable path for the fmf.
-	if (!FS_NativePath(va("%s.fmf", dest), FS_ROOT, fmfpath, sizeof(fmfpath)))
+	if (!FS_SystemPath(va("%s.fmf", dest), FS_ROOT, fmfpath, sizeof(fmfpath)))
 		return;
 
 	//read it in if it exists.
@@ -7996,6 +8157,13 @@ static void COM_InitHomedir(ftemanifest_t *man)
 	com_homepathenabled = com_homepathusable;
 }
 
+#if defined(HAVE_DBUS) && !defined(HAVE_CLIENT)
+#undef HAVE_DBUS
+#endif
+#ifdef HAVE_DBUS
+void FS_OpenFilePicker_f(void);
+#endif
+
 /*
 ================
 COM_InitFilesystem
@@ -8023,6 +8191,9 @@ void COM_InitFilesystem (void)
 
 	Cmd_AddCommandAD("fs_hash", COM_CalcHash_f,	FS_ArbitraryFile_c, "Computes a hash of the specified file.");
 
+#ifdef HAVE_DBUS
+	Cmd_AddCommandD("sys_openfile", FS_OpenFilePicker_f,	"Select a file to open/install/etc.");
+#endif
 
 //
 // -basedir <path>
@@ -8040,6 +8211,7 @@ void COM_InitFilesystem (void)
 	Cvar_Register(&cfg_reload_on_gamedir, "Filesystem");
 	Cvar_Register(&dpcompat_ignoremodificationtimes, "Filesystem");
 	Cvar_Register(&com_fs_cache, "Filesystem");
+	Cvar_Register(&fs_hidesyspaths, "Filesystem");
 	Cvar_Register(&fs_gamename, "Filesystem");
 #ifdef PACKAGEMANAGER
 	Cvar_Register(&pkg_autoupdate, "Filesystem");
@@ -8051,6 +8223,7 @@ void COM_InitFilesystem (void)
 	Cvar_Register(&fs_basepath, "Filesystem");
 	Cvar_Register(&fs_homepath, "Filesystem");
 	Cvar_Register(&fs_dlURL,	"Filesystem");
+	Cvar_Register(&cl_download_mapsrc,	"Filesystem");
 
 	COM_InitHomedir(NULL);
 
@@ -8101,9 +8274,175 @@ void FS_RegisterDefaultFileSystems(void)
 #endif
 	FS_RegisterFileSystemType(NULL, "apk", FSZIP_LoadArchive, false);	//android package
 	FS_RegisterFileSystemType(NULL, "zip", FSZIP_LoadArchive, false);	//regular zip file (don't automatically read from these, because it gets messy)
+	FS_RegisterFileSystemType(NULL, "kpf", FSZIP_LoadArchive, true);	//regular zip file (don't automatically read from these, because it gets messy)
 	FS_RegisterFileSystemType(NULL, "exe", FSZIP_LoadArchive, false);	//for self-extracting zips.
 	FS_RegisterFileSystemType(NULL, "dll", FSZIP_LoadArchive, false);	//for plugin metas / self-extracting zips.
 	FS_RegisterFileSystemType(NULL, "so", FSZIP_LoadArchive, false);	//for plugin metas / self-extracting zips.
 #endif
 	FS_RegisterFileSystemType(NULL, "pk3dir", VFSOS_OpenPath, true);	//used for git repos or whatever, to make packaging easier
 }
+
+#ifdef HAVE_DBUS
+//I'm adding this code primarily for the flatpak builds. this means cmake only, and only when cmake detects the libs. we can also get away with statically linking the dbus lib too, so no dlopen mess, and its only linked in client builds.
+#include <dbus/dbus.h>
+struct openfile_s
+{
+	DBusConnection *conn;
+	char *replypath;
+};
+static void FS_DBus_Poll(int iarg, void *vctx)
+{	//kept ticking over via timers so we don't stall completely
+	struct openfile_s *ctx = vctx;
+	DBusMessage *msg;
+	DBusMessageIter args, opts, dict, var, uris;
+
+	dbus_connection_read_write(ctx->conn, 0);	//see if there's anything new, with no timeout so we don't lock up
+	msg = dbus_connection_pop_message(ctx->conn);
+
+	if (msg)
+	{	//something came back!
+		if (dbus_message_is_signal(msg, "org.freedesktop.portal.Request", "Response") &&
+			!strcmp(dbus_message_get_path(msg), ctx->replypath))
+		{	//okay, this is the one we're interested in.
+			if (dbus_message_iter_init(msg, &args) && dbus_message_iter_get_arg_type(&args) == DBUS_TYPE_UINT32)
+			{
+				//dbus_message_iter_get_basic(&dict, &response); //0 for success, 1 for user cancel, 2 for error.
+				if (dbus_message_iter_next(&args) && dbus_message_iter_get_arg_type(&args) == DBUS_TYPE_ARRAY)
+				{
+					dbus_message_iter_recurse(&args, &opts);
+					for (; dbus_message_iter_get_arg_type(&opts) == DBUS_TYPE_DICT_ENTRY; dbus_message_iter_next(&opts))
+					{
+						dbus_message_iter_recurse(&opts, &dict);
+						if (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_STRING)
+						{
+							const char *optname;
+							dbus_message_iter_get_basic(&dict, &optname);
+							if (dbus_message_iter_next(&dict) && dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_VARIANT)
+							{
+								dbus_message_iter_recurse(&dict, &var);
+								//if (!strcmp(optname, "choices")) //array of string pairs
+								//if (!strcmp(optname, "currentfilter"))
+								if (!strcmp(optname, "uris") && dbus_message_iter_get_arg_type(&var) == DBUS_TYPE_ARRAY)
+								{
+									dbus_message_iter_recurse(&var, &uris);
+									for (; dbus_message_iter_get_arg_type(&uris) == DBUS_TYPE_STRING; dbus_message_iter_next(&uris))
+									{
+										char fullname[MAX_OSPATH];
+										vfsfile_t *f;
+										const char *filename;
+										dbus_message_iter_get_basic(&uris, &filename);
+										if (Sys_ResolveFileURL(filename, strlen(filename), fullname, sizeof(fullname)))
+										{
+											f = VFSOS_Open(fullname, "rb");
+											if (f)
+											{
+//												filename = COM_SkipPath(filename);
+												Host_RunFile(filename,strlen(filename), f);
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			dbus_message_unref(msg);
+
+			dbus_connection_close(ctx->conn);
+			Z_Free((char*)ctx->replypath);
+			return; //can stop requeing now
+		}
+		dbus_message_unref(msg);
+	}
+
+	Cmd_AddTimer(0.2, FS_DBus_Poll, 0, ctx, sizeof(*ctx));
+}
+void FS_OpenFilePicker_f(void)
+{
+	const char *parentwindow = "";
+	const char *title = "All Files";
+	DBusMessage *msg;
+	DBusMessageIter args, opts;
+	struct openfile_s ctx;
+	DBusError err;
+	DBusPendingCall *pending;
+
+	// initialiset the errors
+	dbus_error_init(&err);
+
+	// connect to the system bus and check for errors
+	ctx.conn = dbus_bus_get_private(DBUS_BUS_SESSION, &err);
+	if (dbus_error_is_set(&err))
+	{
+		fprintf(stderr, "Connection Error (%s)\n", err.message);
+		dbus_error_free(&err);
+	}
+	if (!ctx.conn)
+		return;
+
+	// request our name on the bus
+	dbus_bus_register(ctx.conn, &err);
+	if (dbus_error_is_set(&err))
+		dbus_error_free(&err);
+
+	// create a new method call and check for errors
+	msg = dbus_message_new_method_call(
+				"org.freedesktop.portal.Desktop", // target for the method call
+				"/org/freedesktop/portal/desktop", // object to call on
+				"org.freedesktop.portal.FileChooser", // interface to call on
+				"OpenFile"); // method name
+	if (msg)
+	{
+		dbus_message_iter_init_append(msg, &args);
+		dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &parentwindow);
+		dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &title);
+		dbus_message_iter_open_container(&args, DBUS_TYPE_ARRAY, "{sv}", &opts);
+		dbus_message_iter_close_container(&args, &opts);
+
+		//make sure we get the response (without getting any races)
+		dbus_bus_add_match(ctx.conn, "type='signal'"
+							/*",path='/org/freedesktop/portal/desktop/request/UNIQUE/TOKEN'"*/
+							",interface='org.freedesktop.portal.Request'"
+							",member='Response'", &err);
+
+		//now send our request
+		if (!dbus_connection_send_with_reply (ctx.conn, msg, &pending, -1) || !pending)
+		{
+			dbus_message_unref(msg);
+			msg = NULL;
+		}
+		else
+		{
+			dbus_message_unref(msg);
+			dbus_connection_flush(ctx.conn);
+			dbus_pending_call_block(pending);
+
+			//see if we got a reply
+			msg = dbus_pending_call_steal_reply(pending);
+			dbus_pending_call_unref(pending);
+		}
+	}
+	if (msg)
+	{	//read the object path from the response.
+		if (dbus_message_iter_init(msg, &args) && dbus_message_iter_get_arg_type(&args))
+		{
+			dbus_message_iter_get_basic(&args, &ctx.replypath);
+			ctx.replypath = Z_StrDup(ctx.replypath);
+		}
+
+		dbus_message_unref(msg);
+	}
+
+	if (dbus_error_is_set(&err))
+		dbus_error_free(&err);	//oops?
+	if (ctx.replypath)
+	{	//we sent a request, got a valid response... now we need the actual final result... which may take a while...
+		Cmd_AddTimer(0.2, FS_DBus_Poll, 0, &ctx, sizeof(ctx));
+		return;
+	}
+
+	Z_Free(ctx.replypath);
+	dbus_connection_close(ctx.conn);
+}
+#endif
diff --git a/engine/common/fs.h b/engine/common/fs.h
index e46d3941e..e26499821 100644
--- a/engine/common/fs.h
+++ b/engine/common/fs.h
@@ -44,7 +44,7 @@ struct searchpathfuncs_s
 	void			(QDECL *ReadFile)(searchpathfuncs_t *handle, flocation_t *loc, char *buffer);	//reads the entire file in one go (size comes from loc, so make sure the loc is valid, this is for performance with compressed archives)
 	int				(QDECL *EnumerateFiles)(searchpathfuncs_t *handle, const char *match, int (QDECL *func)(const char *fname, qofs_t fsize, time_t mtime, void *parm, searchpathfuncs_t *spath), void *parm);
 
-	int				(QDECL *GeneratePureCRC) (searchpathfuncs_t *handle, int seed, int usepure);
+	int				(QDECL *GeneratePureCRC) (searchpathfuncs_t *handle, const int *seed);
 
 	vfsfile_t *		(QDECL *OpenVFS)(searchpathfuncs_t *handle, flocation_t *loc, const char *mode);
 
@@ -73,6 +73,7 @@ void FS_UnRegisterFileSystemModule(void *module);
 
 void FS_AddHashedPackage(searchpath_t **oldpaths, const char *parent_pure, const char *parent_logical, searchpath_t *search, unsigned int loadstuff, const char *pakpath, const char *qhash, const char *pakprefix, unsigned int packageflags);
 void PM_LoadPackages(searchpath_t **oldpaths, const char *parent_pure, const char *parent_logical, searchpath_t *search, unsigned int loadstuff, int minpri, int maxpri);
+qboolean PM_HandleRedirect(const char *package, char *url, size_t urlsize);
 void PM_ManifestChanged(ftemanifest_t *man);
 void *PM_GeneratePackageFromMeta(vfsfile_t *file, char *fname, size_t fnamesize, enum fs_relative *fsroot);
 void PM_FileInstalled(const char *filename, enum fs_relative fsroot, void *metainfo, qboolean enable); //we finished installing a file via some other mechanism (drag+drop or from server. insert it into the updates menu.
@@ -85,7 +86,7 @@ unsigned int PM_MarkUpdates (void);	//mark new/updated packages as needing insta
 void PM_ApplyChanges(void);	//for -install/-doinstall args
 qboolean PM_AreSourcesNew(qboolean doprompt);
 qboolean PM_FindUpdatedEngine(char *syspath, size_t syspathsize);	//names the engine we should be running
-void PM_AddManifestPackages(ftemanifest_t *man);
+void PM_AddManifestPackages(ftemanifest_t *man, qboolean mayapply);
 void Menu_Download_Update(void);
 
 typedef struct
@@ -107,7 +108,7 @@ enum modsourcetype_e
 
 	MST_UNKNOWN,	//forgot where it came from...
 };
-int FS_EnumerateKnownGames(qboolean (*callback)(void *usr, ftemanifest_t *man, enum modsourcetype_e sourcetype), void *usr);
+int FS_EnumerateKnownGames(qboolean (*callback)(void *usr, ftemanifest_t *man, enum modsourcetype_e sourcetype), void *usr, qboolean fixedbasedir);
 
 struct modlist_s
 {
diff --git a/engine/common/fs_dzip.c b/engine/common/fs_dzip.c
index 1f9a43fd6..95a7b6b4c 100644
--- a/engine/common/fs_dzip.c
+++ b/engine/common/fs_dzip.c
@@ -1214,7 +1214,7 @@ static int QDECL FSDZ_EnumerateFiles (searchpathfuncs_t *handle, const char *mat
 	return true;
 }
 
-static int QDECL FSDZ_GeneratePureCRC(searchpathfuncs_t *handle, int seed, int crctype)
+static int QDECL FSDZ_GeneratePureCRC(searchpathfuncs_t *handle, const int *seed)
 {
 	dzarchive_t *pak = (void*)handle;
 
@@ -1224,7 +1224,8 @@ static int QDECL FSDZ_GeneratePureCRC(searchpathfuncs_t *handle, int seed, int c
 	int i;
 
 	filecrcs = BZ_Malloc((pak->numfiles+1)*sizeof(int));
-	filecrcs[numcrcs++] = seed;
+	if (seed)
+		filecrcs[numcrcs++] = *seed;
 
 	for (i = 0; i < pak->numfiles; i++)
 	{
@@ -1234,10 +1235,7 @@ static int QDECL FSDZ_GeneratePureCRC(searchpathfuncs_t *handle, int seed, int c
 		}
 	}
 
-	if (crctype)
-		result = CalcHashInt(&hash_md4, filecrcs, numcrcs*sizeof(int));
-	else
-		result = CalcHashInt(&hash_md4, filecrcs+1, (numcrcs-1)*sizeof(int));
+	result = CalcHashInt(&hash_md4, filecrcs, numcrcs*sizeof(int));
 
 	BZ_Free(filecrcs);
 	return result;
diff --git a/engine/common/fs_pak.c b/engine/common/fs_pak.c
index a7a5b14b2..f8d409080 100644
--- a/engine/common/fs_pak.c
+++ b/engine/common/fs_pak.c
@@ -12,7 +12,7 @@ typedef struct
 	fsbucket_t bucket;
 
 	char	name[MAX_QPATH];
-	int		filepos, filelen;
+	unsigned int		filepos, filelen;
 } mpackfile_t;
 
 typedef struct pack_s
@@ -24,7 +24,7 @@ typedef struct pack_s
 
 	void		*mutex;
 	vfsfile_t	*handle;
-	unsigned int filepos;	//the pos the subfiles left it at (to optimize calls to vfs_seek)
+	qofs_t		filepos;	//the pos the subfiles left it at (to optimize calls to vfs_seek)
 	qatomic32_t references;	//seeing as all vfiles from a pak file use the parent's vfsfile, we need to keep the parent open until all subfiles are closed.
 } pack_t;
 
@@ -34,27 +34,27 @@ typedef struct pack_s
 typedef struct
 {
 	char	name[56];
-	int		filepos, filelen;
+	unsigned int		filepos, filelen;
 } dpackfile_t;
 
 typedef struct
 {
-	int		filepos, filelen;
+	unsigned int		filepos, filelen;
 	char	name[8];
 } dwadfile_t;
 
 typedef struct
 {
 	char	id[4];
-	int		dirofs;
-	int		dirlen;
+	unsigned int		dirofs;
+	unsigned int		dirlen;
 } dpackheader_t;
 
 typedef struct
 {
 	char	id[4];
-	int		dirlen;
-	int		dirofs;
+	unsigned int		dirlen;
+	unsigned int		dirofs;
 } dwadheader_t;
 
 #define	MAX_FILES_IN_PACK	2048
@@ -129,7 +129,7 @@ static unsigned int QDECL FSPAK_FLocate(searchpathfuncs_t *handle, flocation_t *
 		if (loc)
 		{
 			loc->fhandle = pf;
-			snprintf(loc->rawname, sizeof(loc->rawname), "%s", pak->descname);
+			Q_snprintfz(loc->rawname, sizeof(loc->rawname), "%s", pak->descname);
 			loc->offset = pf->filepos;
 			loc->len = pf->filelen;
 		}
@@ -155,7 +155,7 @@ static int QDECL FSPAK_EnumerateFiles (searchpathfuncs_t *handle, const char *ma
 	return true;
 }
 
-static int QDECL FSPAK_GeneratePureCRC(searchpathfuncs_t *handle, int seed, int crctype)
+static int QDECL FSPAK_GeneratePureCRC(searchpathfuncs_t *handle, const int *seed)
 {	//this is really weak. :(
 	pack_t *pak = (void*)handle;
 
@@ -165,7 +165,8 @@ static int QDECL FSPAK_GeneratePureCRC(searchpathfuncs_t *handle, int seed, int
 	int i;
 
 	filecrcs = BZ_Malloc((pak->numfiles+1)*sizeof(int));
-	filecrcs[numcrcs++] = seed;
+	if (seed)	//so exploiters can't cache it in purity replies.
+		filecrcs[numcrcs++] = *seed;
 
 	for (i = 0; i < pak->numfiles; i++)
 	{
@@ -175,10 +176,7 @@ static int QDECL FSPAK_GeneratePureCRC(searchpathfuncs_t *handle, int seed, int
 		}
 	}
 
-	if (crctype)
-		result = CalcHashInt(&hash_md4, filecrcs, numcrcs*sizeof(int));
-	else
-		result = CalcHashInt(&hash_md4, filecrcs+1, (numcrcs-1)*sizeof(int));
+	result = CalcHashInt(&hash_md4, filecrcs, numcrcs*sizeof(int));
 
 	BZ_Free(filecrcs);
 	return result;
@@ -307,7 +305,7 @@ of the list so they override previous pack files.
 */
 searchpathfuncs_t *QDECL FSPAK_LoadArchive (vfsfile_t *file, searchpathfuncs_t *parent, const char *filename, const char *desc, const char *prefix)
 {
-	dpackheader_t	header;
+	dpackheader_t	header = {};
 	int				i;
 	mpackfile_t		*newfiles;
 	int				numpackfiles;
@@ -327,7 +325,8 @@ searchpathfuncs_t *QDECL FSPAK_LoadArchive (vfsfile_t *file, searchpathfuncs_t *
 	if (read < sizeof(header) || header.id[0] != 'P' || header.id[1] != 'A'
 	|| header.id[2] != 'C' || header.id[3] != 'K')
 	{
-		Con_Printf("%s is not a pak - %c%c%c%c\n", desc, header.id[0], header.id[1], header.id[2], header.id[3]);
+		header.dirofs = 0;
+		Con_Printf("%s is not a pak - \"%s\"\n", desc, header.id);
 		return NULL;
 	}
 	header.dirofs = LittleLong (header.dirofs);
@@ -484,7 +483,7 @@ newsection:
 					newfiles[i].filelen = 4;
 					break;
 				}
-				if (!strncmp(filename, "gl_", 3) && ((filename[3] == 'e' && filename[5] == 'm') || !strncmp(filename+3, "map", 3)))
+				if (!Q_strncmp(filename, "gl_", 3) && ((filename[3] == 'e' && filename[5] == 'm') || !strncmp(filename+3, "map", 3)))
 				{	//this is the start of a beutiful new map
 					section = 5;
 					strcpy(sectionname, filename+3);
diff --git a/engine/common/fs_stdio.c b/engine/common/fs_stdio.c
index 2830e19b1..2e9364520 100644
--- a/engine/common/fs_stdio.c
+++ b/engine/common/fs_stdio.c
@@ -5,7 +5,7 @@
 #include <sys/stat.h>
 #endif
 
-#if !defined(FTE_TARGET_WEB) && (!defined(_WIN32) || defined(FTE_SDL))
+#if !defined(FTE_TARGET_WEB) && (!defined(_WIN32) || defined(FTE_SDL) || defined(WEBSVONLY))
 
 #ifdef WEBSVONLY
 	#define Z_Free free
diff --git a/engine/common/fs_zip.c b/engine/common/fs_zip.c
index fd9b4f1f4..e94d419cf 100644
--- a/engine/common/fs_zip.c
+++ b/engine/common/fs_zip.c
@@ -4,6 +4,36 @@
 //#define AVAIL_BZLIB
 //#define DYNAMIC_BZLIB
 
+
+
+//supported ZIP features:
+//zip64 for huge zips
+//utf-8 encoding support (non-utf-8 is always ibm437)
+//symlink flag
+//compression mode: store
+//compression mode: deflate (via zlib)
+//compression mode: deflate64 (via zlib's unofficial extras)
+//compression mode: bzip2 (via libbz2)
+//bigendian cpus. everything misaligned.
+//weak/original file encryption (set fs_zip_password)
+//split archives (see specific notes)
+
+//NOT supported:
+//other compression modes
+//strong/aes encryption
+//if central dir is crypted/compressed, the archive will fail to open
+//crc verification (if present then the local header must match the central dir, but the file data itself will not be verified in part because that'd require decoding the entire file upfront first)
+//infozip utf-8 name override.
+//other 'extra' fields.
+
+//split archives:
+//the central directory must be stored exclusively inside the initial zip/pk3 file.
+//additional volumes will use the first letter of the extension and then at least two base-10 digits denoting the volume index (eg pak0.pk3 + pak0.p00 + pak0.p01).
+//individual files must not be split over files (no rollover on truncation)
+//fteqcc has a feature to generate versioned centraldir-only zips using external volumes for the actual data. This can be used to avoid downloading redundant data when connecting to servers using older revisions, but such revisions must be centrally managed.
+
+
+
 #ifdef AVAIL_BZLIB
 #	include <bzlib.h>
 #	ifdef DYNAMIC_BZLIB
@@ -47,14 +77,6 @@
 # endif
 # include <zlib.h>
 
-# ifdef _MSC_VER
-#  ifdef _WIN64
-#   pragma comment(lib, MSVCLIBSPATH "zlib64.lib")
-#  else
-#   pragma comment(lib, MSVCLIBSPATH "zlib.lib")
-#  endif
-# endif
-
 # ifdef DYNAMIC_ZLIB
 #  define ZLIB_LOADED() (zlib_handle!=NULL)
 void *zlib_handle;
@@ -801,7 +823,7 @@ static int QDECL FSZIP_EnumerateFiles (searchpathfuncs_t *handle, const char *ma
 	return true;
 }
 
-static int QDECL FSZIP_GeneratePureCRC(searchpathfuncs_t *handle, int seed, int crctype)
+static int QDECL FSZIP_GeneratePureCRC(searchpathfuncs_t *handle, const int *seed)
 {
 	zipfile_t *zip = (void*)handle;
 
@@ -811,7 +833,8 @@ static int QDECL FSZIP_GeneratePureCRC(searchpathfuncs_t *handle, int seed, int
 	int i;
 
 	filecrcs = BZ_Malloc((zip->numfiles+1)*sizeof(int));
-	filecrcs[numcrcs++] = seed;
+	if (seed)
+		filecrcs[numcrcs++] = *seed;
 
 	for (i = 0; i < zip->numfiles; i++)
 	{
@@ -819,10 +842,7 @@ static int QDECL FSZIP_GeneratePureCRC(searchpathfuncs_t *handle, int seed, int
 			filecrcs[numcrcs++] = zip->files[i].crc;
 	}
 
-	if (crctype || numcrcs < 1)
-		result = CalcHashInt(&hash_md4, filecrcs, numcrcs*sizeof(int));
-	else
-		result = CalcHashInt(&hash_md4, filecrcs+1, (numcrcs-1)*sizeof(int));
+	result = CalcHashInt(&hash_md4, filecrcs, numcrcs*sizeof(int));
 
 	BZ_Free(filecrcs);
 	return result;
@@ -1609,30 +1629,6 @@ static vfsfile_t *QDECL FSZIP_OpenVFS(searchpathfuncs_t *handle, flocation_t *lo
 	return (vfsfile_t*)vfsz;
 }
 
-
-//ZIP features:
-//zip64 for huge zips
-//utf-8 encoding support (non-utf-8 is always ibm437)
-//symlink flag
-//compression mode: store
-//compression mode: deflate (via zlib)
-//bigendian cpus. everything misaligned.
-
-//NOT supported:
-//compression mode: deflate64
-//other compression modes
-//split archives
-//if central dir is crypted/compressed, the archive will fail to open
-//if a file is crypted/compressed, the file will (internally) be marked as corrupt
-//crc verification
-//infozip utf-8 name override.
-//other 'extra' fields.
-
-//split archives:
-//central directory must be stored exclusively inside the initial zip.
-//files on other parts will fail to load.
-//individual files must not be split over files
-
 struct zipinfo
 {
 	unsigned int	thisdisk;					//this disk number
diff --git a/engine/common/gl_q2bsp.c b/engine/common/gl_q2bsp.c
index 58a6dac80..66d84e396 100644
--- a/engine/common/gl_q2bsp.c
+++ b/engine/common/gl_q2bsp.c
@@ -231,18 +231,6 @@ static unsigned char q2_palette[256*3];
 #endif
 
 
-/*
-typedef struct q2csurface_s
-{
-	char		name[16];
-	int			flags;
-	int			value;
-} q2csurface_t;
-*/
-
-
-
-
 
 
 typedef struct {
@@ -1679,7 +1667,8 @@ static qboolean CModQ2_LoadFaces (model_t *mod, qbyte *mod_base, lump_t *l, lump
 	int			style;
 
 	struct decoupled_lm_info_s *decoupledlm;
-	unsigned int dcsize, lofs;
+	size_t dcsize;
+	unsigned int lofs;
 
 	unsigned short lmshift, lmscale;
 	char buf[64];
@@ -4061,7 +4050,8 @@ static void CModQ3_LoadLighting (model_t *loadmodel, qbyte *mod_base, lump_t *l)
 	extern cvar_t gl_overbright;
 	float scale = (1<<(2-gl_overbright.ival));
 
-	loadmodel->lightmaps.fmt = LM_L8;
+	loadmodel->lightmaps.fmt = LM_RGB8;
+	loadmodel->lightmaps.prebaked = PTI_RGB8;
 
 	//round up the samples, in case the last one is partial.
 	maps = ((samples+mapsize-1)&~(mapsize-1)) / mapsize;
@@ -4079,8 +4069,6 @@ static void CModQ3_LoadLighting (model_t *loadmodel, qbyte *mod_base, lump_t *l)
 	if (!samples)
 		return;
 
-	loadmodel->lightmaps.fmt = LM_RGB8;
-
 	if (loadmodel->lightmaps.deluxemapping)
 		maps /= 2;
 
@@ -5359,6 +5347,7 @@ static int		CM_LeafArea (model_t *model, int leafnum)
 //=======================================================================
 
 #define PlaneDiff(point,plane) (((plane)->type < 3 ? (point)[(plane)->type] : DotProduct((point), (plane)->normal)) - (plane)->dist)
+#define PlaneDiffPush(point,plane,pushdist) (((plane)->type < 3 ? (point)[(plane)->type] : DotProduct((point), (plane)->normal)) - (plane)->dist - pushdist)
 
 static mplane_t			box_planes[6];
 static model_t			box_model;
@@ -5660,10 +5649,14 @@ static unsigned int CM_NativeContents(struct model_s *model, int hulloverride, c
 		mleaf_t			*leaf;
 		q2cbrush_t		*brush;
 		q2cbrushside_t	*brushside;
+		vec3_t absmin, absmax, ofs;
 
 		int leaflist[64];
 
-		k = CM_BoxLeafnums (model, point, point, leaflist, 64, NULL);
+		VectorAdd(point, mins, absmin);
+		VectorAdd(point, maxs, absmax);
+
+		k = CM_BoxLeafnums (model, absmin, absmax, leaflist, 64, NULL);
 
 		contents = 0;
 		for (k--; k >= 0; k--)
@@ -5680,10 +5673,18 @@ static unsigned int CM_NativeContents(struct model_s *model, int hulloverride, c
 						continue;
 					}
 
+
 					brushside = brush->brushside;
 					for ( j = 0; j < brush->numsides; j++, brushside++ )
 					{
-						if (PlaneDiff (point, brushside->plane) > 0 )
+						for (j=0 ; j<3 ; j++)
+						{
+							if (brushside->plane->normal[j] < 0)
+								ofs[j] = maxs[j];
+							else
+								ofs[j] = mins[j];
+						}
+						if (PlaneDiffPush (point, brushside->plane, DotProduct (ofs, brushside->plane->normal)) > 0)
 							break;
 					}
 
diff --git a/engine/common/json.c b/engine/common/json.c
index 69a1f722a..ecdc1688c 100644
--- a/engine/common/json.c
+++ b/engine/common/json.c
@@ -1,5 +1,12 @@
 #include "quakedef.h"
 
+/*struct jsonparsectx_s
+{
+	char const *const data;
+	const size_t size;
+	size_t pos;
+};*/
+
 //node destruction
 static void JSON_Orphan(json_t *t)
 {
@@ -125,45 +132,45 @@ static json_t *JSON_CreateNode(json_t *parent, const char *namestart, const char
 }
 
 //node parsing
-static void JSON_SkipWhite(const char *msg, int *pos, int max)
+static void JSON_SkipWhite(struct jsonparsectx_s *ctx)
 {
-	while (*pos < max)
+	while (ctx->pos < ctx->size)
 	{
 		//if its simple whitespace then keep skipping over it
-		if (msg[*pos] == ' ' ||
-			msg[*pos] == '\t' ||
-			msg[*pos] == '\r' ||
-			msg[*pos] == '\n' )
+		if (ctx->data[ctx->pos] == ' ' ||
+			ctx->data[ctx->pos] == '\t' ||
+			ctx->data[ctx->pos] == '\r' ||
+			ctx->data[ctx->pos] == '\n' )
 		{
-			*pos+=1;
+			ctx->pos+=1;
 			continue;
 		}
 
 		//BEGIN NON-STANDARD - Note that comments are NOT part of json, but people insist on using them anyway (c-style, like javascript).
-		else if (msg[*pos] == '/' && *pos+1 < max)
+		else if (ctx->data[ctx->pos] == '/' && ctx->pos+1 < ctx->size)
 		{
-			if (msg[*pos+1] == '/')
+			if (ctx->data[ctx->pos+1] == '/')
 			{	//C++ style single-line comments that continue till the next line break
-				*pos+=2;
-				while (*pos < max)
+				ctx->pos+=2;
+				while (ctx->pos < ctx->size)
 				{
-					if (msg[*pos] == '\r' || msg[*pos] == '\n')
+					if (ctx->data[ctx->pos] == '\r' || ctx->data[ctx->pos] == '\n')
 						break;	//ends on first line break (the break is then whitespace will will be skipped naturally)
-					*pos+=1;	//not yet
+					ctx->pos+=1;	//not yet
 				}
 				continue;
 			}
-			else if (msg[*pos+1] == '*')
+			else if (ctx->data[ctx->pos+1] == '*')
 			{	/*C style multi-line comment*/
-				*pos+=2;
-				while (*pos+1 < max)
+				ctx->pos+=2;
+				while (ctx->pos+1 < ctx->size)
 				{
-					if (msg[*pos] == '*' && msg[*pos+1] == '/')
+					if (ctx->data[ctx->pos] == '*' && ctx->data[ctx->pos+1] == '/')
 					{
-						*pos+=2;	//skip past the terminator ready for whitespace or trailing comments directly after
+						ctx->pos+=2;	//skip past the terminator ready for whitespace or trailing comments directly after
 						break;
 					}
-					*pos+=1;	//not yet
+					ctx->pos+=1;	//not yet
 				}
 				continue;
 			}
@@ -327,20 +334,20 @@ size_t JSON_ReadBody(json_t *t, char *out, size_t outsize)
 	return t->bodyend-t->bodystart;
 }
 
-static qboolean JSON_ParseString(char const*msg, int *pos, int max, char const**start, char const** end)
+static qboolean JSON_ParseString(struct jsonparsectx_s *ctx, char const**start, char const** end)
 {
-	if (*pos < max && msg[*pos] == '\"')
+	if (ctx->pos < ctx->size && ctx->data[ctx->pos] == '\"')
 	{	//quoted string
 		//FIXME: no handling of backslash followed by one of "\/bfnrtu
-		*pos+=1;
-		*start = msg+*pos;
-		while (*pos < max)
+		ctx->pos+=1;
+		*start = ctx->data+ctx->pos;
+		while (ctx->pos < ctx->size)
 		{
-			if (msg[*pos] == '\"')
+			if (ctx->data[ctx->pos] == '\"')
 				break;
-			if (msg[*pos] == '\\')
+			if (ctx->data[ctx->pos] == '\\')
 			{	//escapes are expanded elsewhere, we're just skipping over them here.
-				switch(msg[*pos+1])
+				switch(ctx->data[ctx->pos+1])
 				{
 				case '\"':
 				case '\\':
@@ -350,137 +357,137 @@ static qboolean JSON_ParseString(char const*msg, int *pos, int max, char const**
 				case 'n':
 				case 'r':
 				case 't':
-					*pos+=2;
+					ctx->pos+=2;
 					break;
 				case 'u':
-					*pos+=2;
+					ctx->pos+=2;
 					//*pos+=4; //4 hex digits, not escapes so just wait till later before parsing them properly.
 					break;
 				default:
 					//unknown escape. will warn when actually reading it.
-					*pos+=1;
+					ctx->pos+=1;
 					break;
 				}
 			}
 			else
-				*pos+=1;
+				ctx->pos+=1;
 		}
-		if (*pos < max && msg[*pos] == '\"')
+		if (ctx->pos < ctx->size && ctx->data[ctx->pos] == '\"')
 		{
-			*end = msg+*pos;
-			*pos+=1;
+			*end = ctx->data+ctx->pos;
+			ctx->pos+=1;
 			return true;
 		}
 	}
 	else
 	{	//name
-		*start = msg+*pos;
-		while (*pos < max
-			&& msg[*pos] != ' '
-			&& msg[*pos] != '\t'
-			&& msg[*pos] != '\r'
-			&& msg[*pos] != '\n'
-			&& msg[*pos] != ':'
-			&& msg[*pos] != ','
-			&& msg[*pos] != '}'
-			&& msg[*pos] != '{'
-			&& msg[*pos] != '['
-			&& msg[*pos] != ']')
+		*start = ctx->data+ctx->pos;
+		while (ctx->pos < ctx->size
+			&& ctx->data[ctx->pos] != ' '
+			&& ctx->data[ctx->pos] != '\t'
+			&& ctx->data[ctx->pos] != '\r'
+			&& ctx->data[ctx->pos] != '\n'
+			&& ctx->data[ctx->pos] != ':'
+			&& ctx->data[ctx->pos] != ','
+			&& ctx->data[ctx->pos] != '}'
+			&& ctx->data[ctx->pos] != '{'
+			&& ctx->data[ctx->pos] != '['
+			&& ctx->data[ctx->pos] != ']')
 		{
-			*pos+=1;
+			ctx->pos+=1;
 		}
-		*end = msg+*pos;
+		*end = ctx->data+ctx->pos;
 		if (*start != *end)
 			return true;
 	}
 	*end = *start;
 	return false;
 }
-json_t *JSON_ParseNode(json_t *t, const char *namestart, const char *nameend, const char *json, int *jsonpos, int jsonlen)
+json_t *JSON_ParseNode(json_t *t, const char *namestart, const char *nameend, struct jsonparsectx_s *ctx)
 {
 	const char *childstart, *childend;
-	JSON_SkipWhite(json, jsonpos, jsonlen);
+	JSON_SkipWhite(ctx);
 
-	if (*jsonpos < jsonlen)
+	if (ctx->pos < ctx->size)
 	{
-		if (json[*jsonpos] == '{')
+		if (ctx->data[ctx->pos] == '{')
 		{
-			*jsonpos+=1;
-			JSON_SkipWhite(json, jsonpos, jsonlen);
+			ctx->pos+=1;
+			JSON_SkipWhite(ctx);
 
 			t = JSON_CreateNode(t, namestart, nameend, NULL, NULL, json_type_object);
 
-			while (*jsonpos < jsonlen && json[*jsonpos] == '\"')
+			while (ctx->pos < ctx->size && ctx->data[ctx->pos] == '\"')
 			{
-				if (!JSON_ParseString(json, jsonpos, jsonlen, &childstart, &childend))
+				if (!JSON_ParseString(ctx, &childstart, &childend))
 					break;
-				JSON_SkipWhite(json, jsonpos, jsonlen);
-				if (*jsonpos < jsonlen && json[*jsonpos] == ':')
+				JSON_SkipWhite(ctx);
+				if (ctx->pos < ctx->size && ctx->data[ctx->pos] == ':')
 				{
-					*jsonpos+=1;
-					if (!JSON_ParseNode(t, childstart, childend, json, jsonpos, jsonlen))
+					ctx->pos+=1;
+					if (!JSON_ParseNode(t, childstart, childend, ctx))
 						break;
 				}
-				JSON_SkipWhite(json, jsonpos, jsonlen);
+				JSON_SkipWhite(ctx);
 
-				if (*jsonpos < jsonlen && json[*jsonpos] == ',')
+				if (ctx->pos < ctx->size && ctx->data[ctx->pos] == ',')
 				{
-					*jsonpos+=1;
-					JSON_SkipWhite(json, jsonpos, jsonlen);
+					ctx->pos+=1;
+					JSON_SkipWhite(ctx);
 					continue;
 				}
 				break;
 			}
 
-			if (*jsonpos < jsonlen && json[*jsonpos] == '}')
+			if (ctx->pos < ctx->size && ctx->data[ctx->pos] == '}')
 			{
-				*jsonpos+=1;
+				ctx->pos+=1;
 				return t;
 			}
 			JSON_Destroy(t);
 		}
-		else if (json[*jsonpos] == '[')
+		else if (ctx->data[ctx->pos] == '[')
 		{
 			char idxname[MAX_QPATH];
 			unsigned int idx = 0;
-			*jsonpos+=1;
-			JSON_SkipWhite(json, jsonpos, jsonlen);
+			ctx->pos+=1;
+			JSON_SkipWhite(ctx);
 
 			t = JSON_CreateNode(t, namestart, nameend, NULL, NULL, json_type_array);
 
 			for(;;)
 			{
 				Q_snprintfz(idxname, sizeof(idxname), "%u", idx++);
-				if (!JSON_ParseNode(t, idxname, NULL, json, jsonpos, jsonlen))
+				if (!JSON_ParseNode(t, idxname, NULL, ctx))
 					break;
 
-				if (*jsonpos < jsonlen && json[*jsonpos] == ',')
+				if (ctx->pos < ctx->size && ctx->data[ctx->pos] == ',')
 				{
-					*jsonpos+=1;
-					JSON_SkipWhite(json, jsonpos, jsonlen);
+					ctx->pos+=1;
+					JSON_SkipWhite(ctx);
 					continue;
 				}
 				break;
 			}
 
-			JSON_SkipWhite(json, jsonpos, jsonlen);
-			if (*jsonpos < jsonlen && json[*jsonpos] == ']')
+			JSON_SkipWhite(ctx);
+			if (ctx->pos < ctx->size && ctx->data[ctx->pos] == ']')
 			{
-				*jsonpos+=1;
+				ctx->pos+=1;
 				return t;
 			}
 			JSON_Destroy(t);
 		}
 		else
 		{
-			if (json[*jsonpos] == '\"')
+			if (ctx->data[ctx->pos] == '\"')
 			{
-				if (JSON_ParseString(json, jsonpos, jsonlen, &childstart, &childend))
+				if (JSON_ParseString(ctx, &childstart, &childend))
 					return JSON_CreateNode(t, namestart, nameend, childstart, childend, json_type_string);
 			}
 			else
 			{
-				if (JSON_ParseString(json, jsonpos, jsonlen, &childstart, &childend))
+				if (JSON_ParseString(ctx, &childstart, &childend))
 				{
 					if (childend-childstart == 4 && !strncasecmp(childstart, "true", 4))
 						return JSON_CreateNode(t, namestart, nameend, childstart, childend, json_type_true);
@@ -498,11 +505,15 @@ json_t *JSON_ParseNode(json_t *t, const char *namestart, const char *nameend, co
 }
 json_t *JSON_Parse(const char *json)
 {
-	size_t jsonlen = strlen(json);
-	int pos = (json[0] == '\xef' && json[1] == '\xbb' && json[2] == '\xbf')?3:0;	//skip a utf-8 bom, if present, to be a bit more permissive.
-	json_t *n = JSON_ParseNode(NULL, NULL, NULL, json, &pos, jsonlen);
-	JSON_SkipWhite(json, &pos, jsonlen);
-	if (pos == jsonlen)
+	struct jsonparsectx_s ctx =
+	{
+		json,
+		strlen(json),
+		(json[0] == '\xef' && json[1] == '\xbb' && json[2] == '\xbf')?3:0,	//skip a utf-8 bom, if present, to be a bit more permissive.
+	};
+	json_t *n = JSON_ParseNode(NULL, NULL, NULL, &ctx);
+	JSON_SkipWhite(&ctx);
+	if (ctx.pos == ctx.size)
 		return n;
 	JSON_Destroy(n);	//trailing junk?... fail it.
 	return NULL;
@@ -580,6 +591,14 @@ json_t *JSON_GetIndexed(json_t *t, unsigned int idx)
 	return NULL;
 }
 
+size_t JSON_GetCount(json_t *t)
+{	//can't cope with deletions.
+	size_t count = 0;
+	while (JSON_GetIndexed(t, count))
+		count++;
+	return count;
+}
+
 
 //helpers...
 json_t *JSON_FindIndexedChild(json_t *t, const char *child, unsigned int idx)
diff --git a/engine/common/log.c b/engine/common/log.c
index c0a0da5d2..3a6c0f432 100644
--- a/engine/common/log.c
+++ b/engine/common/log.c
@@ -265,8 +265,8 @@ static struct {
 	{"logrcon",		" frags"},
 };
 
-void Log_Logfile_f (void)
-{
+static void Log_Logfile_f (void)
+{	//these legacy commands are just toggles. not args (other than the commandname to know which log type to toggle)
 	size_t logtype;
 	const char *cmd = Cmd_Argv(0);
 	for (logtype = 0; logtype < countof(legacylog); logtype++)
@@ -293,7 +293,7 @@ void Log_Logfile_f (void)
 		else
 			f = va("%s.log", f);
 
-		if (FS_NativePath(f, log_root, syspath, sizeof(syspath)))
+		if (FS_DisplayPath(f, log_root, syspath, sizeof(syspath)))
 			Con_Printf("%s", va("Logging%s to %s\n", legacylog[logtype].desc, syspath));
 		else
 			Con_Printf("%s", va("Logging%s to %s\n", legacylog[logtype].desc, f));
@@ -301,44 +301,6 @@ void Log_Logfile_f (void)
 	}
 
 }
-/*
-void SV_Fraglogfile_f (void)
-{
-	char	name[MAX_QPATH];
-	int		i;
-
-	if (sv_fraglogfile)
-	{
-		Con_TPrintf ("Frag file logging off.\n");
-		VFS_CLOSE (sv_fraglogfile);
-		sv_fraglogfile = NULL;
-		return;
-	}
-
-	// find an unused name
-	for (i=0 ; i<1000 ; i++)
-	{
-		sprintf (name, "frag_%i.log", i);
-		sv_fraglogfile = FS_OpenVFS(name, "rb", FS_GAME);
-		if (!sv_fraglogfile)
-		{	// can't read it, so create this one
-			sv_fraglogfile = FS_OpenVFS (name, "wb", FS_GAME);
-			if (!sv_fraglogfile)
-				i=1000;	// give error
-			break;
-		}
-		VFS_CLOSE (sv_fraglogfile);
-	}
-	if (i==1000)
-	{
-		Con_TPrintf ("Can't open any logfiles.\n");
-		sv_fraglogfile = NULL;
-		return;
-	}
-
-	Con_TPrintf ("Logging frags to %s.\n", name);
-}
-*/
 #endif
 
 #ifdef IPLOG
@@ -605,10 +567,10 @@ static int IPLog_Dump(const char *fname)
 }
 static void IPLog_Dump_f(void)
 {
-	char native[MAX_OSPATH];
+	char displaypath[MAX_OSPATH];
 	const char *fname = Cmd_Argv(1);
-	if (FS_NativePath(fname, FS_GAMEONLY, native, sizeof(native)))
-		Q_strncpyz(native, fname, sizeof(native));
+	if (FS_DisplayPath(fname, FS_GAMEONLY, displaypath, sizeof(displaypath)))
+		Q_strncpyz(displaypath, fname, sizeof(displaypath));
 	IPLog_Merge_File(fname);	//merge from the existing file, so that we're hopefully more robust if multiple processes are poking the same file.
 	switch (IPLog_Dump(fname))
 	{
@@ -617,7 +579,7 @@ static void IPLog_Dump_f(void)
 		break;
 	default:
 	case 1:
-		Con_Printf("wrote %s\n", native);
+		Con_Printf("wrote %s\n", displaypath);
 		break;
 	case 2:
 		Con_Printf("nothing to write\n");
@@ -814,7 +776,7 @@ qboolean CertLog_ConnectOkay(const char *hostname, void *cert, size_t certsize,
 		//(but do pin so we at least know when its MITMed after the fact)
 		Con_Printf(CON_WARNING"Auto-Pinning certificate for %s."CON_DEFAULT" ^[/seta %s 2^]+ for actual security.\n", hostname, net_enable_dtls.name);
 		if (certsize)
-			Base64_EncodeBlockURI(digest, CalcHash(&hash_sha1, digest, sizeof(digest), cert, certsize), fp, sizeof(fp));
+			Base64_EncodeBlockURI(digest, CalcHash(&hash_certfp, digest, sizeof(digest), cert, certsize), fp, sizeof(fp));
 		else
 			strcpy(fp, "<No Certificate>");
 		Con_Printf(S_COLOR_GRAY"  fp: %s\n", fp);
@@ -824,7 +786,7 @@ qboolean CertLog_ConnectOkay(const char *hostname, void *cert, size_t certsize,
 	else if (!l || l->certsize != certsize || memcmp(l->cert, cert, certsize) || (trusted && !l->trusted))
 	{	//new or different
 		if (certsize)
-			Base64_EncodeBlockURI(digest, CalcHash(&hash_sha1, digest, sizeof(digest), cert, certsize), fp, sizeof(fp));
+			Base64_EncodeBlockURI(digest, CalcHash(&hash_certfp, digest, sizeof(digest), cert, certsize), fp, sizeof(fp));
 		else
 			strcpy(fp, "<No Certificate>");
 		if (qrenderer)
@@ -1062,9 +1024,8 @@ void Log_Init(void)
 		Cvar_Register (&log_enable[i], CONLOGGROUP);
 		Cvar_Register (&log_name[i], CONLOGGROUP);
 		log_newline[i] = true;
-#ifdef IPLOG
-		Cmd_AddCommand(legacylog[i].commandname, IPLog_Merge_f);
-#endif
+
+		Cmd_AddCommand(legacylog[i].commandname, Log_Logfile_f);
 	}
 	Cvar_Register (&log_dir_var, CONLOGGROUP);
 	Cvar_Register (&log_readable, CONLOGGROUP);
diff --git a/engine/common/net.h b/engine/common/net.h
index 9a3bf3b38..86f1fe1bd 100644
--- a/engine/common/net.h
+++ b/engine/common/net.h
@@ -68,8 +68,6 @@ typedef enum {
 	NP_INVALID
 } netproto_t;
 
-typedef enum {NS_CLIENT, NS_SERVER} netsrc_t;
-
 typedef struct netadr_s
 {
 	netadrtype_t	type;
@@ -91,7 +89,7 @@ typedef struct netadr_s
 		} irc;
 #endif
 #ifdef SUPPORT_ICE
-		char icename[16];
+		char icename[64];
 #endif
 #ifdef HAVE_WEBSOCKCL
 		char websocketurl[64];
@@ -243,7 +241,7 @@ qboolean NET_RegisterCrypto(void *module, struct ftecrypto_s *driver);
 
 #define	OLD_AVG		0.99		// total = oldtotal*OLD_AVG + new*(1-OLD_AVG)
 
-#define	MAX_LATENT	32
+//#define	MAX_LATENT	32
 #define MAX_ADR_SIZE	64
 
 typedef struct
@@ -256,12 +254,26 @@ typedef struct
 	float		nqreliable_resendtime;//force nqreliable_allowed, thereby forcing a resend of anything n
 	qbyte		nqunreliableonly;	//nq can't cope with certain reliables some times. if 2, we have a reliable that result in a block (that should be sent). if 1, we are blocking. if 0, we can send reliables freely. if 3, then we just want to ignore clc_moves
 #endif
-	qboolean	pext_fragmentation;	//fte's packet fragmentation extension, to avoid issues with low mtus.
-	qboolean	pext_stunaware;		//prevent the two lead-bits of packets from being either 0(stun), so stray stun packets cannot mess things up for us.
+	unsigned int flags;	//NCF_ bitmask
+			#define NCF_CLIENT		(1u<<0)	//clientside sends the qport.
+			#define NCF_SERVER		(0u<<0)	//serverside reads the qport.
+			#define NCF_FRAGABLE	(1u<<1)	//fte's packet fragmentation extension, to avoid issues with low mtus.
+			#define NCF_STUNAWARE	(1u<<2)	//prevent the two lead-bits of packets from being either 0(stun), so stray stun packets cannot mess things up for us.
 	struct netprim_s netprim;
-	int			mtu;				//the path mtu, if known
 	int			dupe;				//how many times to dupe packets
 
+	//Packetisation Layer Path MTU Discovery (PLPMTUD / RFC4821)
+	int			mtu_cur;				//the path mtu, if known
+	int			mtu_min;				//minimum mtu to drop to. lower values being abusive.
+	int			mtu_max;				//the size the user specified.
+	int			mtu_resends;			//number of times we had to resend a reliable.
+	int			mtu_overhead;			//extra slop vs a
+	int			outgoing_mtu_probe;		//sequence number that was a probe. if its acked we can send a new one straight away to grow fast. if its not acked, we back off.
+	int			mtu_probes;				//number of probes sent without success. give up if we get no growth.
+	double		mtu_reprobetime;		//send an extra mtu probe every 30ish secs to see if it grew
+	unsigned short sentsizes[64];		//to bump known mtu if an oversized packet got received.
+	int			outgoing_sequence_last;	//to detect gaps in outgoing sequences (servers get forced to match client's)
+
 	float		last_received;		// for timeouts
 
 // the statistics are cleared at each client begin, because
@@ -270,13 +282,11 @@ typedef struct
 	float		frame_rate;
 
 	int			drop_count;			// dropped packets, cleared each level
-	int			good_count;			// cleared each level
 
 	int			bytesin;
 	int			bytesout;
 
 	netadr_t	remote_address;
-	netsrc_t	sock;
 	int			qport;
 	int			qportsize;
 
@@ -307,8 +317,8 @@ typedef struct
 	qbyte		reliable_buf[MAX_OVERALLMSGLEN];	// unacked reliable message
 
 // time and size data to calculate bandwidth
-	int			outgoing_size[MAX_LATENT];
-	double		outgoing_time[MAX_LATENT];
+//	int			outgoing_size[MAX_LATENT];
+//	double		outgoing_time[MAX_LATENT];
 	struct huffman_s	*compresstable;
 
 	//nq servers must recieve truncated packets.
@@ -322,12 +332,13 @@ extern	int	net_drop;		// packets dropped before this one
 void Net_Master_Init(void);
 
 void Netchan_Init (void);
+size_t Netchan_GetMaxUnreliable(netchan_t *chan);
 int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate);
-void Netchan_OutOfBand (netsrc_t sock, netadr_t *adr, int length, const qbyte *data);
-void VARGS Netchan_OutOfBandPrint (netsrc_t sock, netadr_t *adr, char *format, ...) LIKEPRINTF(3);
-void VARGS Netchan_OutOfBandTPrintf (netsrc_t sock, netadr_t *adr, int language, translation_t text, ...);
+void Netchan_OutOfBand (unsigned int ncflags, netadr_t *adr, int length, const qbyte *data);
+void VARGS Netchan_OutOfBandPrint (unsigned int ncflags, netadr_t *adr, char *format, ...) LIKEPRINTF(3);
+void VARGS Netchan_OutOfBandTPrintf (unsigned int ncflags, netadr_t *adr, int language, translation_t text, ...);
 qboolean Netchan_Process (netchan_t *chan);
-void Netchan_Setup (netsrc_t sock, netchan_t *chan, netadr_t *adr, int qport);
+void Netchan_Setup (unsigned int ncflags, netchan_t *chan, netadr_t *adr, int qport, unsigned int mtu);
 unsigned int Net_PextMask(unsigned int protover, qboolean fornq);
 extern cvar_t net_mtu;
 
diff --git a/engine/common/net_chan.c b/engine/common/net_chan.c
index 9519d0cdc..f1e67056d 100644
--- a/engine/common/net_chan.c
+++ b/engine/common/net_chan.c
@@ -98,9 +98,10 @@ cvar_t	pext_lerptime = CVARD("_pext_lerptime", "0", "RENAME ME WHEN STABLE. Send
 cvar_t	pext_infoblobs = CVARD("_pext_infoblobs", "0", "RENAME ME WHEN STABLE. Enables the use of very large infokeys containing potentially invalid chars. Note that the userinfo is still limited by sv_userinfo_bytelimit and sv_userinfo_keylimit.");
 cvar_t	pext_replacementdeltas = CVARD("pext_replacementdeltas", "1", "Enables the use of alternative nack-based entity deltas");
 cvar_t	pext_predinfo = CVARD("pext_predinfo", "1", "Enables some extra things to support prediction over NQ protocols.");
+extern cvar_t net_fakemtu;
 
 #if defined(HAVE_CLIENT) && defined(HAVE_SERVER)
-#define NET_SendPacket(c,s,d,t) NET_SendPacket(((c)!=NS_CLIENT)?svs.sockets:cls.sockets,s,d,t)
+#define NET_SendPacket(c,s,d,t) NET_SendPacket((c&NCF_CLIENT)?cls.sockets:svs.sockets,s,d,t)
 #elif defined(HAVE_SERVER)
 #define NET_SendPacket(c,s,d,t) NET_SendPacket(svs.sockets,s,d,t)
 #else
@@ -303,7 +304,7 @@ Netchan_OutOfBand
 Sends an out-of-band datagram
 ================
 */
-void Netchan_OutOfBand (netsrc_t sock, netadr_t *adr, int length, const qbyte *data)
+void Netchan_OutOfBand (unsigned int ncflags, netadr_t *adr, int length, const qbyte *data)
 {
 	sizebuf_t	send;
 	qbyte		send_buf[MAX_QWMSGLEN + PACKET_HEADER];
@@ -322,7 +323,7 @@ void Netchan_OutOfBand (netsrc_t sock, netadr_t *adr, int length, const qbyte *d
 #ifndef SERVERONLY
 	if (!cls.demoplayback)
 #endif
-		NET_SendPacket (sock, send.cursize, send.data, adr);
+		NET_SendPacket (ncflags, send.cursize, send.data, adr);
 }
 
 /*
@@ -332,7 +333,7 @@ Netchan_OutOfBandPrint
 Sends a text message in an out-of-band datagram
 ================
 */
-void VARGS Netchan_OutOfBandPrint (netsrc_t sock, netadr_t *adr, char *format, ...)
+void VARGS Netchan_OutOfBandPrint (unsigned int ncflags, netadr_t *adr, char *format, ...)
 {
 	va_list		argptr;
 	static char		string[8192];		// ??? why static?
@@ -342,10 +343,10 @@ void VARGS Netchan_OutOfBandPrint (netsrc_t sock, netadr_t *adr, char *format, .
 	va_end (argptr);
 
 
-	Netchan_OutOfBand (sock, adr, strlen(string), (qbyte *)string);
+	Netchan_OutOfBand (ncflags, adr, strlen(string), (qbyte *)string);
 }
 #ifndef CLIENTONLY
-void VARGS Netchan_OutOfBandTPrintf (netsrc_t sock, netadr_t *adr, int language, translation_t text, ...)
+void VARGS Netchan_OutOfBandTPrintf (unsigned int ncflags, netadr_t *adr, int language, translation_t text, ...)
 {
 	va_list		argptr;
 	static char		string[8192];		// ??? why static?
@@ -359,9 +360,44 @@ void VARGS Netchan_OutOfBandTPrintf (netsrc_t sock, netadr_t *adr, int language,
 	va_end (argptr);
 
 
-	Netchan_OutOfBand (sock, adr, strlen(string), (qbyte *)string);
+	Netchan_OutOfBand (ncflags, adr, strlen(string), (qbyte *)string);
 }
 #endif
+
+size_t Netchan_GetMaxUnreliable(netchan_t *chan)
+{	//returns the maximum unreliable size we should be aiming for
+
+
+#ifdef HAVE_SERVER
+	//debug prints
+	if (!(chan->flags&NCF_CLIENT) && chan == &svs.clients[0].netchan)
+	{
+		static int oldmtu;
+		if (oldmtu != chan->mtu_cur)
+		{
+			Con_DPrintf("Player0 MTU changed %i->%i\n", oldmtu, chan->mtu_cur);
+			oldmtu = chan->mtu_cur;
+		}
+	}
+#endif
+
+//	if (chan->remote_address.type == NA_LOOPBACK)
+//		return ~0u;	//our client supports big stuff. demos don't really care either so its fine.
+
+
+	if (chan->incoming_acknowledged > chan->last_reliable_sequence
+		&& chan->incoming_reliable_acknowledged != chan->reliable_sequence)
+	{	//we want to send a reliable...
+		if (chan->reliable_length)	//one will be resent
+			return chan->mtu_cur - chan->reliable_length;
+		if (chan->message.cursize)	//a new one will go out
+			return chan->mtu_cur - chan->message.cursize;
+	}
+
+
+	return chan->mtu_cur;
+}
+
 /*
 ==============
 Netchan_Setup
@@ -369,28 +405,75 @@ Netchan_Setup
 called to open a channel to a remote system
 ==============
 */
-void Netchan_Setup (netsrc_t sock, netchan_t *chan, netadr_t *adr, int qport)
+void Netchan_Setup (unsigned int flags, netchan_t *chan, netadr_t *adr, int qport, unsigned int mtu)
 {
 	memset (chan, 0, sizeof(*chan));
 
-	chan->sock = sock;
+	chan->flags = flags;
 	chan->remote_address = *adr;
 	chan->last_received = realtime;
 #ifdef NQPROT
 	chan->nqreliable_allowed = true;
 #endif
 	chan->incoming_unreliable = -1;
-	
-	chan->message.data = chan->message_buf;
-	chan->message.allowoverflow = true;
-	chan->message.maxsize = MAX_QWMSGLEN;
 
-	chan->qport = qport;
+	if (flags&NCF_CLIENT)
+		chan->outgoing_sequence = 1;	//so the first one doesn't get dropped.
 
 	if (adr->prot == NP_KEXLAN)
 		chan->qportsize = 0;
 	else
 		chan->qportsize = 2;
+	chan->qport = qport;
+
+
+
+	//input mtu is the expected 'udp data size'
+	if (mtu<64 || mtu > 0xffff)
+		mtu = MAX_QWMSGLEN;
+	mtu = max(mtu, 508);
+
+	//compute the minimum mtu for the address type
+	if (adr->type == NA_IP)
+		chan->mtu_min = 508;	//576 - 20..60(IP header) - 8(udp header)
+	else if (adr->type == NA_IPV6)
+		chan->mtu_min = 1200;
+	else if (adr->type == NA_IPX)
+		chan->mtu_min = 1450;
+#ifdef SUPPORT_ICE
+	else if (adr->type == NA_ICE)
+		chan->mtu_min = 508;	//match ipv4 here...
+#endif
+	else if (adr->type == NA_LOOPBACK)
+		chan->mtu_min = 8192;
+	else
+		chan->mtu_min = 1450;
+	if (chan->mtu_min < 1024)
+		chan->mtu_min = 1200;	//the internet is ethernet. if you can't deal with ipv6's limit then your connection is seriously dodgy. plus this lets us be a bit more agressive.
+
+	mtu -= PACKET_HEADER;	//Note: This is not considered in vanilla - meaning net_mtu should be 1458 to match it (which will probably cause PTB issues).
+	if (flags&NCF_CLIENT)
+		mtu -= chan->qportsize;
+	if (flags&NCF_FRAGABLE)
+		mtu -= 2;
+#ifdef SUPPORT_ICE
+	if (adr->type == NA_ICE)
+		mtu -= 48+12;	//fixme: check if we're actually using the dtls and sctp layers or not.
+	else
+#endif
+	{
+		if (adr->prot == NP_DTLS || adr->prot == NP_TLS)
+			mtu -= 48;
+	}
+
+	chan->mtu_min = min(mtu, chan->mtu_min);
+	chan->mtu_cur = mtu;	//try to use the requested size to begin with. if it fails (probably on the realibles) then we'll allow it to drop
+	chan->mtu_max = mtu;	//don't grow beyond what the user set. we're not aware of multiple paths nor are we tracking packetloss rates so if its partly wrong they'll get a load more loss, so don't be agressive here. let the user do that themselves!
+	chan->mtu_reprobetime = realtime;	//try and grow the effective mtu after a bit (route may have changed)
+
+	chan->message.data = chan->message_buf;
+	chan->message.allowoverflow = true;
+	chan->message.maxsize = min(chan->mtu_cur, sizeof(chan->message_buf));
 }
 
 
@@ -481,9 +564,8 @@ enum nqnc_packettype_e NQNetChan_Process(netchan_t *chan)
 		//note: its zlib rather than raw deflate (wasting a further 6 bytes...).
 		net_message.cursize = ZLib_DecompressBuffer(net_message.data+8, net_message.cursize-8, tmp, 0xffff);
 		if (net_message.cursize < PACKET_HEADER)
-#endif
 		{
-			if (chan->sock == NS_CLIENT)
+			if (chan->flags&NCF_CLIENT)
 			{	//clients can just throw an error. the server will appear dead if we try to just ignore it.
 				Host_EndGame("QuakeEx netchan decompression error");
 				return NQNC_IGNORED;
@@ -499,6 +581,15 @@ enum nqnc_packettype_e NQNetChan_Process(netchan_t *chan)
 
 		MSG_BeginReading (&net_message, chan->netprim);
 		header = LongSwap(MSG_ReadLong());	//re-read the now-decompressed copy of the header for the real flags
+#else
+		if (chan->flags&NCF_CLIENT)
+			Host_EndGame("NQNetChan_Process: zlib not enabled at compile time");
+		else
+			Con_Printf("QuakeEx netchan decompression error");
+		net_message.data[8] = (chan->flags&NCF_CLIENT)?svc_disconnect:clc_disconnect;
+		net_message.cursize = 9;
+		return NQNC_RELIABLE;
+#endif
 	}
 #endif
 	if (net_message.cursize != (header & NETFLAG_LENGTH_MASK))
@@ -534,7 +625,7 @@ enum nqnc_packettype_e NQNetChan_Process(netchan_t *chan)
 
 		if (showpackets.value)
 			Con_Printf ("in  %s a=%i %i\n"
-						, chan->sock != NS_SERVER?"s2c":"c2s"
+						, (chan->flags&NCF_CLIENT)?"s2c":"c2s"
 						, sequence
 						, 0);
 
@@ -568,11 +659,10 @@ enum nqnc_packettype_e NQNetChan_Process(netchan_t *chan)
 		chan->last_received = realtime;
 
 		chan->incoming_acknowledged++;
-		chan->good_count++;
 
 		if (showpackets.value)
 			Con_Printf ("in  %s u=%i %i\n"
-						, chan->sock != NS_SERVER?"s2c":"c2s"
+						, (chan->flags&NCF_CLIENT)?"c2s":"s2c"
 						, chan->incoming_unreliable
 						, net_message.cursize);
 		return NQNC_UNRELIABLE;
@@ -583,10 +673,10 @@ enum nqnc_packettype_e NQNetChan_Process(netchan_t *chan)
 		//always reply. a stale sequence probably means our ack got lost.
 		runt[0] = BigLong(NETFLAG_ACK | 8);
 		runt[1] = BigLong(sequence);
-		NET_SendPacket (chan->sock, 8, runt, &net_from);
+		NET_SendPacket (chan->flags, 8, runt, &net_from);
 		if (showpackets.value)
 			Con_Printf ("out %s a=%i %i\n"
-						, chan->sock == NS_SERVER?"s2c":"c2s"
+						, (chan->flags&NCF_CLIENT)?"c2s":"s2c"
 						, sequence
 						, 0);
 
@@ -613,7 +703,7 @@ enum nqnc_packettype_e NQNetChan_Process(netchan_t *chan)
 
 				if (showpackets.value)
 					Con_Printf ("in  %s r=%i %i\n"
-								, chan->sock != NS_SERVER?"s2c":"c2s"
+								, (chan->flags&NCF_CLIENT)?"s2c":"c2s"
 								, sequence
 								, net_message.cursize);
 				return NQNC_RELIABLE;	//we can read it now
@@ -648,12 +738,14 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 	qbyte		send_buf[MAX_OVERALLMSGLEN + PACKET_HEADER];
 	qboolean	send_reliable;
 	char		remote_adr[MAX_ADR_SIZE];
-	unsigned	w1, w2;
+	unsigned	w1, w2, mtuseq;
 	int			i;
 	neterr_t e;
 
+	qboolean ismtuprobe;
 	int dupes = chan->dupe;
 	int availbytes = Netchan_CanBytes(chan, rate);
+	int hsz;
 	availbytes = max(0, availbytes); //make sure it can't go negative (clientside doesn't check rate limits much)
 
 #ifdef NQPROT
@@ -688,7 +780,7 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 				MSG_WriteLong(&send, LongSwap(chan->reliable_sequence));
 
 				//limit the payload length to nq's datagram max size.
-				//relax the limitation if its reliable (ie: over tcp) where its assumed to have no real limit
+				//relax the limitation if its reliable (ie: over tcp) where its assumed to have no real limit (beware tunnels)
 				if (i > MAX_NQDATAGRAM && !NET_AddrIsReliable(&chan->remote_address))
 					i = MAX_NQDATAGRAM;
 
@@ -711,13 +803,13 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 				sentsize += send.cursize;
 				if (showpackets.value)
 					Con_Printf ("out %s r s=%i %i\n"
-						, chan->sock == NS_SERVER?"s2c":"c2s"
+						, (chan->flags&NCF_CLIENT)?"c2s":"s2c"
 						, chan->reliable_sequence
 						, send.cursize);
 				chan->nqreliable_allowed = false;
-				chan->nqreliable_resendtime = realtime + 0.3;	//resend reliables after 0.3 seconds. nq transports suck.
+				chan->nqreliable_resendtime = realtime + 0.3;	//resend reliables after 0.3 seconds. nq transports suck. FIXME: reduce to pingtime
 
-				if (NET_SendPacket (chan->sock, send.cursize, send.data, &chan->remote_address) == NETERR_SENT && (
+				if (NET_SendPacket (chan->flags, send.cursize, send.data, &chan->remote_address) == NETERR_SENT && (
 					NET_AddrIsReliable(&chan->remote_address) || chan->nqunreliableonly==3	))
 				{	//if over tcp (or we're dropping the connection), everything is assumed to be reliable. pretend it got acked now.
 					//if we get an ack later, then who cares.
@@ -746,17 +838,17 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 
 			*(int*)send_buf = BigLong(NETFLAG_UNRELIABLE | send.cursize);
 			for (i = -1, e = NETERR_SENT; i < dupes && e == NETERR_SENT; i++)
-				e = NET_SendPacket (chan->sock, send.cursize, send.data, &chan->remote_address);
+				e = NET_SendPacket (chan->flags, send.cursize, send.data, &chan->remote_address);
 			sentsize += send.cursize*i;
-			if (e == NETERR_MTU && chan->mtu > 560)
-			{
-				Con_Printf("Reducing MSS to %i\n", chan->mtu);
-				chan->mtu -= 10;
+			if (e == NETERR_MTU && chan->mtu_cur > chan->mtu_min)
+			{	//yay, router works properly. unfortunately we don't know the exact size so keep retrying with a slightly smaller value until it goes through...
+				chan->mtu_cur = max(chan->mtu_min, chan->mtu_cur-10);
+				Con_Printf("Reducing MSS to %i\n", chan->mtu_cur);
 			}
 
 			if (showpackets.value)
 				Con_Printf ("out %s u=%i %i\n"
-						, chan->sock == NS_SERVER?"s2c":"c2s"
+						, (chan->flags&NCF_CLIENT)?"c2s":"s2c"
 						, chan->outgoing_unreliable-1
 						, send.cursize);
 			send.cursize = 0;
@@ -781,7 +873,7 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 
 	if (chan->incoming_acknowledged > chan->last_reliable_sequence
 	&& chan->incoming_reliable_acknowledged != chan->reliable_sequence)
-		send_reliable = true;
+		send_reliable = true;	//they acked a later packet without acking the reliable...
 
 // if the reliable transmit buffer is empty, copy the current message out
 	if (!chan->reliable_length && chan->message.cursize)
@@ -791,9 +883,11 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 		chan->message.cursize = 0;
 		chan->reliable_sequence ^= 1;
 		send_reliable = true;
+
+		chan->mtu_resends=0;
 	}
 
-	if (send_reliable && chan->remote_address.prot == NP_KEXLAN)
+	if (send_reliable && chan->remote_address.prot == NP_KEXLAN)	//FIXME: use with webrtc too - sctp can avoid the round-trip delay.
 #ifndef SERVERONLY
 	if (!cls.demoplayback)
 #endif
@@ -801,14 +895,14 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 		if (chan->reliable_length)
 		{
 			send.data = send_buf;
-			send.maxsize = (chan->mtu?chan->mtu:MAX_QWMSGLEN) + PACKET_HEADER;
+			send.maxsize = sizeof(send_buf);
 			send.cursize = 0;
 
 			MSG_WriteLong (&send, 1u<<31);
 			MSG_WriteLong (&send, 1u<<31);
 			SZ_Write (&send, chan->reliable_buf, chan->reliable_length);
 
-			if (NETERR_SENT == NET_SendPacket (chan->sock, send.cursize, send.data, &chan->remote_address))
+			if (NETERR_SENT == NET_SendPacket (chan->flags, send.cursize, send.data, &chan->remote_address))
 				chan->reliable_length = 0;	//the lower layer will handle any retransmission for us.
 		}
 		send_reliable = 0;
@@ -817,13 +911,18 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 
 // write the packet header
 	send.data = send_buf;
-	send.maxsize = (chan->mtu?chan->mtu:MAX_QWMSGLEN) + PACKET_HEADER;
+	send.maxsize = PACKET_HEADER + ((chan->flags&NCF_CLIENT)?chan->qportsize:0) + ((chan->flags&NCF_FRAGABLE)?2:0);
+	send.maxsize += chan->mtu_cur;
 	send.cursize = 0;
 
+	mtuseq = chan->outgoing_sequence&(countof(chan->sentsizes)-1);
+	for (; (chan->outgoing_sequence_last&(countof(chan->sentsizes)-1)) != mtuseq; chan->outgoing_sequence_last++)
+		chan->sentsizes[chan->outgoing_sequence_last&(countof(chan->sentsizes)-1)] = 0;	//lost c2s or something, gaps now.
+
 	w1 = chan->outgoing_sequence | (send_reliable<<31);
 	w2 = chan->incoming_sequence | (chan->incoming_reliable_sequence<<31);
 
-	if (chan->pext_stunaware)
+	if (chan->flags&NCF_STUNAWARE)
 	{
 		w1 = BigLong(w1+ANTISTUNBIAS);
 		w2 = BigLong(w2);
@@ -833,23 +932,26 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 
 	MSG_WriteLong (&send, w1);
 	MSG_WriteLong (&send, w2);
+	hsz = 8;
 
 	// send the qport if we are a client
 #ifndef SERVERONLY
-	if (chan->sock == NS_CLIENT)
+	if (chan->flags&NCF_CLIENT)
 	{
 		if (chan->qportsize == 2)
 			MSG_WriteShort (&send, chan->qport);
 		else if (chan->qportsize == 1)
 			MSG_WriteByte (&send, chan->qport&0xff);
+		hsz += chan->qportsize;
 	}
 #endif
 
-	if (chan->pext_fragmentation)
+	if (chan->flags&NCF_FRAGABLE)
 	{
 		//allow the max size to be bigger, sending everything available
-		send.maxsize = MAX_OVERALLMSGLEN + PACKET_HEADER;
+		send.maxsize = MAX_OVERALLMSGLEN-100;
 		MSG_WriteShort(&send, 0);
+		hsz += 2;
 	}
 
 // copy the reliable message to the packet first
@@ -868,22 +970,70 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 		}
 		SZ_Write (&send, chan->reliable_buf, chan->reliable_length);
 		chan->last_reliable_sequence = chan->outgoing_sequence;
+
+		if (chan->mtu_resends > 5)
+		{	//getting blackholed?
+			if (chan->mtu_cur > chan->mtu_min)
+			{	//reset the mtu, and re-enable probes to get it back up to something usable.
+				chan->mtu_cur = chan->mtu_min;
+//				chan->mtu_cur = max(chan->mtu_min, min(send.cursize, chan->mtu_cur-16));
+				Con_DPrintf("Reliables Blackholed? Reducing MSS to %i\n", chan->mtu_cur);
+				chan->mtu_probes = 0;	//and try and grow it again.
+			}
+			//chan->mtu_resends = 0;
+		}
+		chan->mtu_resends++;
 	}
-	
+
+	if (chan->outgoing_sequence - chan->incoming_acknowledged > 128 && chan->mtu_cur > chan->mtu_min)
+	{
+		chan->mtu_cur = chan->mtu_min;
+//		chan->mtu_cur = max(chan->mtu_min, min(send.cursize, chan->mtu_cur-16));
+		Con_DPrintf("MTU blackhole? Reducing MSS to %i\n", chan->mtu_cur);
+		chan->mtu_probes = 0;	//and try and grow it again.
+	}
+
 // add the unreliable part if space is available
 	if (send.maxsize - send.cursize >= length)
 		SZ_Write (&send, data, length);
 
+	ismtuprobe = false;
+	if (chan->mtu_reprobetime < realtime)
+	{
+		chan->mtu_probes = min(chan->mtu_probes,4);
+		chan->mtu_reprobetime = realtime + 30;
+	}
+	if (!send_reliable/*reliables depend on round trip times, don't risk losing them*/ &&
+		chan->incoming_acknowledged >= chan->outgoing_mtu_probe+chan->mtu_probes/*not still waiting for one, slow down a bit if they're dropping.*/ &&
+		chan->mtu_cur < chan->mtu_max && chan->mtu_probes < 5/*give up if its just not growing*/)
+	{
+		int targsize = min(chan->mtu_max, chan->mtu_cur+16);
+		int padsize = (hsz+targsize)-send.cursize;
+		if (padsize > 0 && targsize <= send.maxsize)
+		{
+			if (chan->flags&NCF_CLIENT)
+				Q_memset (SZ_GetSpace(&send,padsize),clc_nop,padsize);
+			else
+				Q_memset (SZ_GetSpace(&send,padsize),svc_nop,padsize);
+			ismtuprobe = true;	//don't do our fragmentation stuff.
+			chan->mtu_probes++;
+			chan->outgoing_mtu_probe = chan->outgoing_sequence;
+			chan->mtu_reprobetime = realtime + 30;
+			Con_DPrintf("Sending mtu probe\n");
+		}
+	}
+
+
 // send the datagram
-	i = chan->outgoing_sequence & (MAX_LATENT-1);
-	chan->outgoing_size[i] = send.cursize;
-	chan->outgoing_time[i] = realtime;
+//	i = chan->outgoing_sequence & (MAX_LATENT-1);
+//	chan->outgoing_size[i] = send.cursize;
+//	chan->outgoing_time[i] = realtime;
 
 #ifdef HUFFNETWORK
 	if (chan->compresstable)
 	{
 		//int oldsize = send.cursize;
-		Huff_CompressPacket(chan->compresstable, &send, 8 + ((chan->sock == NS_CLIENT)?2:0) + (chan->pext_fragmentation?2:0));
+		Huff_CompressPacket(chan->compresstable, &send, 8 + ((chan->flags&NCF_CLIENT)?2:0) + (chan->flags&NCF_FRAGABLE?2:0));
 //		Con_Printf("%i becomes %i\n", oldsize, send.cursize);
 //		Huff_DecompressPacket(&send, (chan->sock == NS_CLIENT)?10:8);
 	}
@@ -895,23 +1045,25 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 	if (!cls.demoplayback)
 #endif
 	{
-		int hsz = 10 + ((chan->sock == NS_CLIENT)?chan->qportsize:0); /*header size, if fragmentation is in use*/
 		dupes = min(chan->dupe, availbytes / send.cursize);
 
-		if ((!chan->pext_fragmentation))// || send.cursize < ((chan->mtu - hsz)&~7))
+		if (ismtuprobe || !(chan->flags&NCF_FRAGABLE))// || send.cursize < ((chan->mtu - hsz)&~7))
 		{	//vanilla sends
 			for (i = -1; i < dupes && e == NETERR_SENT; i++)
-				e = NET_SendPacket (chan->sock, send.cursize, send.data, &chan->remote_address);
-			send.cursize += send.cursize * i;
+				e = NET_SendPacket (chan->flags, send.cursize, send.data, &chan->remote_address);
 
 			//ipv4 'guarentees' mtu sizes of at least 560ish.
 			//our reliable/backbuf messages are limited to 1024 bytes.
 			//this means that large reliables may be unsendable.
-			if (e == NETERR_MTU && chan->mtu > 560)
+			if (e == NETERR_MTU && send.cursize-hsz > chan->mtu_min)
 			{
-				Con_Printf("Reducing MSS to %i\n", chan->mtu);
-				chan->mtu -= 10;
+				chan->mtu_cur = max(chan->mtu_min, send.cursize-hsz-10);
+				chan->mtu_max = min(chan->mtu_max, chan->mtu_cur);	//don't try growing past it
+				Con_Printf("Reducing MSS to %i\n", chan->mtu_cur);
 			}
+			chan->sentsizes[mtuseq] = send.cursize-hsz;
+
+			send.cursize += send.cursize * i;
 		}
 		else
 		{	//fte's fragmentaton protocol
@@ -925,14 +1077,15 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 			/*send the additional parts, adding new headers within the previous packet*/
 			do
 			{
-				no = offset + chan->mtu - hsz;
+				no = offset + chan->mtu_cur - hsz;
+
 				if (no < send.cursize-hsz)
 				{
 					no &= ~7;
 					more = true;
 				}
 				else
-				{
+				{	//this is the last...
 					no = send.cursize-hsz;
 					more = false;
 				}
@@ -940,7 +1093,7 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 				*(int*)&send.data[(offset) + 0] = LittleLong(w1);
 				*(int*)&send.data[(offset) + 4] = LittleLong(w2);
 #ifndef SERVERONLY
-				if (chan->sock == NS_CLIENT)
+				if (chan->flags&NCF_CLIENT)
 				{
 					if (chan->qportsize == 2)
 						*(short*)&send.data[offset + hsz-4] = LittleShort(chan->qport);
@@ -955,16 +1108,20 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 					for (i = -1; i < dupes && e == NETERR_SENT; i++)
 					{
 						fragbytes = (no - offset) + hsz;
-						e = NET_SendPacket (chan->sock, fragbytes, send.data + offset, &chan->remote_address);
-						outbytes += fragbytes;
-						if (e == NETERR_MTU && !offset && chan->mtu > 560)
+						e = NET_SendPacket (chan->flags, fragbytes, send.data + offset, &chan->remote_address);
+						if (e == NETERR_MTU && !offset && chan->mtu_cur > chan->mtu_min)
 						{
-							chan->mtu -= 16;
-							Con_Printf("Reducing MSS to %i\n", chan->mtu);
+							chan->mtu_cur = max(chan->mtu_min, chan->mtu_cur-16);
+							chan->mtu_max = min(chan->mtu_max, chan->mtu_cur);	//don't try growing past it
+							Con_Printf("Reducing MSS to %i\n", chan->mtu_cur);
 							no = offset;
 							more = true;
+							e = NETERR_SENT; //... keep trying...
 							break;
 						}
+						if (!offset)
+							chan->sentsizes[mtuseq] = fragbytes-hsz;
+						outbytes += fragbytes;
 					}
 				}
 				offset = no;
@@ -1000,7 +1157,7 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
 		}
 		Con_Printf ("%f %s --> s=%i(%i) a=%i(%i) %i%s\n"
 			, Sys_DoubleTime()
-			, chan->sock == NS_SERVER?"s2c":"c2s"
+			, (chan->flags&NCF_CLIENT)?"c2s":"s2c"
 			, chan->outgoing_sequence
 			, send_reliable
 			, chan->incoming_sequence
@@ -1026,6 +1183,7 @@ qboolean Netchan_Process (netchan_t *chan)
 	unsigned		reliable_ack, reliable_message;
 	char			adr[MAX_ADR_SIZE];
 	int offset;
+	int oob_reliable;
 
 	if (
 #ifndef SERVERONLY
@@ -1041,7 +1199,7 @@ qboolean Netchan_Process (netchan_t *chan)
 	sequence = MSG_ReadLong ();
 	sequence_ack = MSG_ReadLong ();
 
-	if (chan->pext_stunaware)
+	if (chan->flags&NCF_STUNAWARE)
 	{
 		sequence = BigLong(sequence);
 		if (!(sequence&ANTISTUNBIAS))
@@ -1050,13 +1208,15 @@ qboolean Netchan_Process (netchan_t *chan)
 		sequence_ack = BigLong(sequence_ack);
 	}
 
+	oob_reliable = (sequence == (1u<<31) && sequence_ack == (1u<<31));
+
 	// skip over the qport if we are a server (its handled elsewhere)
 #ifndef CLIENTONLY
-	if (chan->sock == NS_SERVER)
+	if (!(chan->flags&NCF_CLIENT))
 		MSG_ReadSkip (chan->qportsize);
 #endif
 
-	if (chan->pext_fragmentation)
+	if (chan->flags&NCF_FRAGABLE)
 		offset = (unsigned short)MSG_ReadShort();
 	else
 		offset = 0;
@@ -1070,7 +1230,7 @@ qboolean Netchan_Process (netchan_t *chan)
 	if (showpackets.value)
 		Con_Printf ("%f %s <-- s=%i(%i) a=%i(%i) %i%s\n"
 			, Sys_DoubleTime()
-			, chan->sock == NS_SERVER?"c2s":"s2c"
+			, (chan->flags&NCF_CLIENT)?"s2c":"c2s"
 			, sequence
 			, reliable_message
 			, sequence_ack
@@ -1111,16 +1271,42 @@ qboolean Netchan_Process (netchan_t *chan)
 //
 // discard stale or duplicated packets
 //
-	if (sequence <= (unsigned)chan->incoming_sequence &&
-		!(reliable_message && chan->remote_address.prot == NP_KEXLAN))	//*sigh* reliables don't work properly here.
-	{
-		if (showdrop.value)
-			Con_TPrintf ("%s:Out of order packet %i at %i\n"
+	if (oob_reliable)
+	{	//if its an oob reliable then its sequence numbers are screwy and bypass the dupe/etc check.
+		if (NET_AddrIsReliable(&chan->remote_address))
+			;	//mostly for NP_KEXLAN.
+		else
+		{
+			Con_TPrintf ("%s:Unexpected out-of-band reliable at %i\n"
 				, NET_AdrToString (adr, sizeof(adr), &chan->remote_address)
-				,  sequence
 				, chan->incoming_sequence);
-		return false;
+			return false;
+		}
 	}
+	else
+	{
+		int ssize = 0;
+		if (sequence <= (unsigned)chan->incoming_sequence &&
+			!(reliable_message && chan->remote_address.prot == NP_KEXLAN))	//*sigh* reliables don't work properly here.
+		{
+			if (showdrop.value)
+				Con_TPrintf ("%s:Out of order packet %i at %i\n"
+					, NET_AdrToString (adr, sizeof(adr), &chan->remote_address)
+					,  sequence
+					, chan->incoming_sequence);
+			return false;
+		}
+
+		if (chan->outgoing_sequence-sequence_ack < countof(chan->sentsizes)-2)
+			ssize = chan->sentsizes[sequence_ack&(countof(chan->sentsizes)-1)];
+		if (ssize && ssize > chan->mtu_cur)
+		{
+			chan->mtu_cur = ssize;
+			Con_DPrintf("MTU confirmed to %i\n", chan->mtu_cur);
+			chan->mtu_probes = 0;	//start growing again.
+		}
+	}
+
 
 	if (offset)
 	{
@@ -1209,7 +1395,7 @@ qboolean Netchan_Process (netchan_t *chan)
 //
 // if this message contains a reliable message, bump incoming_reliable_sequence 
 //
-	if (reliable_message && chan->remote_address.prot == NP_KEXLAN)	//*sigh* reliables don't work properly here.
+	if (oob_reliable)	//*sigh* reliables don't work properly here.
 		;	//don't corrupt sequences/acks/etc.
 	else
 	{
@@ -1228,7 +1414,6 @@ qboolean Netchan_Process (netchan_t *chan)
 		+ (chan->outgoing_sequence-sequence_ack)*(1.0-OLD_AVG);
 	chan->frame_rate = chan->frame_rate*OLD_AVG
 		+ (realtime-chan->last_received)*(1.0-OLD_AVG);		
-	chan->good_count += 1;
 
 	chan->last_received = realtime;
 
diff --git a/engine/common/net_ice.c b/engine/common/net_ice.c
index a7bf6c125..6d0274805 100644
--- a/engine/common/net_ice.c
+++ b/engine/common/net_ice.c
@@ -297,8 +297,10 @@ static const struct
 static neterr_t ICE_Transmit(void *cbctx, const qbyte *data, size_t datasize);
 static neterr_t TURN_Encapsulate(struct icestate_s *ice, netadr_t *to, const qbyte *data, size_t datasize);
 static void TURN_AuthorisePeer(struct icestate_s *con, struct iceserver_s *srv, int peer);
+#ifdef HAVE_DTLS
 static neterr_t SCTP_Transmit(sctp_t *sctp, const void *data, size_t length);
-
+#endif
+static qboolean ICE_SetFailed(struct icestate_s *con, const char *reasonfmt, ...) LIKEPRINTF(2);
 static struct icestate_s *icelist;
 
 
@@ -2168,8 +2170,7 @@ static qboolean QDECL ICE_Set(struct icestate_s *con, const char *prop, const ch
 						con->dtlsstate = con->dtlsfuncs->CreateContext(&con->cred, con, ICE_Transmit, con->dtlspassive);
 					else if (net_enable_dtls.ival >= 3)
 					{	//peer doesn't seem to support dtls.
-						con->state = ICE_FAILED;
-						Con_Printf(CON_WARNING"WARNING: [%s]: peer does not support dtls. Set net_enable_dtls to 1 to make optional.\n", con->friendlyname);
+						ICE_SetFailed(con, "peer does not support dtls. Set net_enable_dtls to 1 to make optional.\n");
 					}
 					else if (con->state == ICE_CONNECTING && net_enable_dtls.ival>=2)
 						Con_Printf(CON_WARNING"WARNING: [%s]: peer does not support dtls.\n", con->friendlyname);
@@ -2189,10 +2190,7 @@ static qboolean QDECL ICE_Set(struct icestate_s *con, const char *prop, const ch
 			else if (!con->dtlsstate && con->cred.peer.hash)
 			{
 				if (!con->peersctpoptional)
-				{
-					con->state = ICE_FAILED;
-					Con_Printf(CON_WARNING"WARNING: [%s]: peer is trying to use dtls.%s\n", con->friendlyname, net_enable_dtls.ival?"":" Set ^[/net_enable_dtls 1^].");
-				}
+					ICE_SetFailed(con, "peer is trying to use dtls.%s\n", net_enable_dtls.ival?"":" Set ^[/net_enable_dtls 1^].");
 			}
 #endif
 		}
@@ -2248,10 +2246,7 @@ static qboolean QDECL ICE_Set(struct icestate_s *con, const char *prop, const ch
 		if (oldstate != con->state && con->state == ICE_CONNECTED)
 		{
 			if (con->chosenpeer.type == NA_INVALID)
-			{
-				con->state = ICE_FAILED;
-				Con_Printf(CON_WARNING"[%s]: ICE failed. peer not valid.\n", con->friendlyname);
-			}
+				ICE_SetFailed(con, "ICE failed. peer not valid.\n");
 #ifndef CLIENTONLY
 			else if (con->proto == ICEP_QWSERVER && con->mode != ICEM_WEBRTC)
 			{
@@ -2413,6 +2408,18 @@ static qboolean QDECL ICE_Set(struct icestate_s *con, const char *prop, const ch
 		return false;
 	return true;
 }
+static qboolean ICE_SetFailed(struct icestate_s *con, const char *reasonfmt, ...)
+{
+	va_list		argptr;
+	char		string[256];
+
+	va_start (argptr, reasonfmt);
+	Q_vsnprintf (string,sizeof(string)-1, reasonfmt,argptr);
+	va_end (argptr);
+
+	Con_Printf(CON_WARNING"[%s]: %s\n", con->friendlyname, string);
+	return ICE_Set(con, "state", STRINGIFY(ICE_FAILED));	//does the disconnection stuff.
+}
 static char *ICE_CandidateToSDP(struct icecandidate_s *can, char *value, size_t valuelen)
 {
 	Q_snprintfz(value, valuelen, "a=candidate:%i %i %s %i %s %i typ %s",
@@ -2988,7 +2995,7 @@ void ICE_Tick(void)
 				continue;
 			}
 			else if ((signed int)(curtime-con->icetimeout) > 0)
-				ICE_Set(con, "state", STRINGIFY(ICE_FAILED));	//with no broker context, if we're not trying to send anything then kill the link.
+				ICE_SetFailed(con, S_COLOR_GRAY"[%s]: ice timeout\n", con->friendlyname);
 		}
 
 		switch(con->mode)
@@ -3195,6 +3202,7 @@ struct sctp_chunk_s
 #define SCTP_TYPE_COOKIEECHO 10
 #define SCTP_TYPE_COOKIEACK 11
 #define SCTP_TYPE_SHUTDOWNDONE 14
+#define SCTP_TYPE_PAD 132
 #define SCTP_TYPE_FORWARDTSN 192
 	qbyte flags;
 	quint16_t length;
@@ -3712,6 +3720,7 @@ void SCTP_Decode(sctp_t *sctp, ftenet_connections_t *col)
 						sctp->cookie = Z_Malloc(sctp->cookiesize);
 						memcpy(sctp->cookie, p+1, sctp->cookiesize);
 						break;
+					case 32773:	//Padding
 					case 32776:	//ASCONF
 						break;
 					case 49152:
@@ -3720,6 +3729,12 @@ void SCTP_Decode(sctp_t *sctp, ftenet_connections_t *col)
 					default:
 						if (net_ice_debug.ival >= 2)
 							Con_Printf(S_COLOR_GRAY"[%s]: SCTP: Found unknown init parameter %i||%#x\n", sctp->friendlyname, ptype, ptype);
+
+						if (ptype&0x4000)
+							; //FIXME: SCTP_TYPE_ERROR(6,"Unrecognized Chunk Type")
+						if (!(ptype&0x8000))
+							return;	//'do not process nay further chunks'
+						//otherwise parse the next as normal.
 						break;
 					}
 					p = (void*)((qbyte*)p + ((plen+3)&~3));
@@ -3811,11 +3826,11 @@ void SCTP_Decode(sctp_t *sctp, ftenet_connections_t *col)
 		case SCTP_TYPE_ABORT:
 			SCTP_ErrorChunk(sctp, "Abort", (struct sctp_errorcause_s*)(c+1), clen-sizeof(*c));
 			if (sctp->icestate)
-				ICE_Set(sctp->icestate, "state", STRINGIFY(ICE_FAILED));
+				ICE_SetFailed(sctp->icestate, "SCTP Abort");
 			break;
 		case SCTP_TYPE_SHUTDOWN:	//FIXME. we should send an ack...
 			if (sctp->icestate)
-				ICE_Set(sctp->icestate, "state", STRINGIFY(ICE_FAILED));
+				ICE_SetFailed(sctp->icestate, "SCTP Shutdown");
 			if (net_ice_debug.ival >= 1)
 				Con_Printf(S_COLOR_GRAY"[%s]: SCTP: Shutdown\n", sctp->friendlyname);
 			break;
@@ -3849,6 +3864,9 @@ void SCTP_Decode(sctp_t *sctp, ftenet_connections_t *col)
 		case SCTP_TYPE_COOKIEACK:
 			sctp->o.writable = true;	//we know the other end is now open.
 			break;
+		case SCTP_TYPE_PAD:
+			//don't care.
+			break;
 		case SCTP_TYPE_FORWARDTSN:
 			if (clen >= sizeof(struct sctp_chunk_fwdtsn_s))
 			{
@@ -3874,6 +3892,24 @@ void SCTP_Decode(sctp_t *sctp, ftenet_connections_t *col)
 			//no idea what this chunk is, just ignore it...
 			if (net_ice_debug.ival >= 1)
 				Con_Printf(S_COLOR_GRAY"[%s]: SCTP: Unsupported chunk %i\n", sctp->friendlyname, c->type);
+
+			switch (c->type>>6)
+			{
+			case 0:
+				clen = (qbyte*)msgend - (qbyte*)c;	//'do not process any further chunks'
+				break;
+			case 1:
+				clen = (qbyte*)msgend - (qbyte*)c;	//'do not process any further chunks'
+				/*FIXME: SCTP_TYPE_ERROR(6,"Unrecognized Chunk Type")*/
+				break;
+			case 2:
+				//silently ignore it
+				break;
+			case 3:
+				//ignore-with-error
+				/*FIXME: SCTP_TYPE_ERROR(6,"Unrecognized Chunk Type")*/
+				break;
+			}
 			break;
 		}
 		c = (struct sctp_chunk_s*)((qbyte*)c + ((clen+3)&~3));	//next chunk is 4-byte aligned.
@@ -5015,7 +5051,7 @@ qboolean ICE_WasStun(ftenet_connections_t *col)
 							case NETERR_NOROUTE:
 								return false;	//not a dtls packet at all. don't de-ICE it when we're meant to be using ICE.
 							case NETERR_DISCONNECTED:	//dtls failure. ICE failed.
-								iceapi.Set(con, "state", STRINGIFY(ICE_FAILED));
+								ICE_SetFailed(con, "DTLS Failure");
 								return true;
 							default: //some kind of failure decoding the dtls packet. drop it.
 								return true;
@@ -5528,7 +5564,7 @@ handleerror:
 					b->serverid = cl;
 
 					if (net_ice_debug.ival)
-						Con_Printf(S_COLOR_GRAY"[%s]: Relay to server now open\n", b->ice?b->ice->friendlyname:"?");
+						Con_Printf(S_COLOR_GRAY"[%s]: Meta channel to game server now open\n", b->ice?b->ice->friendlyname:"?");
 				}
 				break;
 			case ICEMSG_OFFER:	//we received an offer from a client
@@ -5604,6 +5640,10 @@ handleerror:
 					}
 				}
 				break;
+			default:
+				if (net_ice_debug.ival)
+					Con_Printf(S_COLOR_GRAY"[%s]: Broker send unknown packet: %i\n", b->ice?b->ice->friendlyname:"?", cmd);
+				break;
 			}
 			break;
 		}
@@ -5765,9 +5805,9 @@ void SVC_ICE_Offer(void)
 	if (!sv.state)
 		return;	//err..?
 	if (net_from.prot != NP_DTLS && net_from.prot != NP_WSS && net_from.prot != NP_TLS)
-	{	//a) dtls provides a challenge.
+	{	//a) dtls provides a challenge (ensuring we can at least ban them).
 		//b) this contains the caller's ips. We'll be pinging them anyway, but hey. also it'll be too late at this point but it keeps the other side honest.
-		Con_ThrottlePrintf(&throttletimer, 0, CON_WARNING"%s: ice handshake via %s was unencrypted\n", NET_AdrToString (buf, sizeof(buf), &net_from));
+		Con_ThrottlePrintf(&throttletimer, 0, CON_WARNING"%s: ice handshake from %s was unencrypted\n", NET_AdrToString (buf, sizeof(buf), &net_from), clientaddr);
 		return;
 	}
 
diff --git a/engine/common/net_ssl_gnutls.c b/engine/common/net_ssl_gnutls.c
index 4ce4d25da..95ff8d72c 100644
--- a/engine/common/net_ssl_gnutls.c
+++ b/engine/common/net_ssl_gnutls.c
@@ -155,8 +155,8 @@
 	GNUTLS_FUNC(gnutls_certificate_set_verify_function,void,(gnutls_certificate_credentials_t cred, gnutls_certificate_verify_function *func))	\
 	GNUTLS_FUNC(gnutls_session_get_ptr,void*,(gnutls_session_t session))	\
 	GNUTLS_FUNC(gnutls_session_set_ptr,void,(gnutls_session_t session, void *ptr))	\
-	GNUTLS_FUNCPTR(gnutls_malloc,void*,(size_t))	\
-	GNUTLS_FUNCPTR(gnutls_free,void,(void * ptr))	\
+	GNUTLS_FUNCPTR(gnutls_malloc,void*,(size_t sz),(sz))	\
+	GNUTLS_FUNCPTR(gnutls_free,void,(void *ptr),(ptr))	\
 	GNUTLS_FUNC(gnutls_server_name_set,int,(gnutls_session_t session, gnutls_server_name_type_t type, const void * name, size_t name_length))	\
 	GNUTLS_TRUSTFUNCS	\
 	GNUTLS_VERIFYFUNCS	\
@@ -166,10 +166,10 @@
 
 #ifdef GNUTLS_DYNAMIC
 	#define GNUTLS_FUNC(n,ret,args) static ret (VARGS *q##n)args;
-	#define GNUTLS_FUNCPTR(n,ret,args) static ret (VARGS **q##n)args;
+	#define GNUTLS_FUNCPTR(n,ret,arglist,callargs) static ret (VARGS **q##n)arglist;
 #else
 	#define GNUTLS_FUNC(n,ret,args) static ret (VARGS *q##n)args = n;
-	#define GNUTLS_FUNCPTR(n,ret,args) static ret (VARGS **q##n)args = &n;
+	#define GNUTLS_FUNCPTR(n,ret,arglist,callargs) static ret VARGS q##n arglist {return n(callargs);};
 #endif
 
 #ifdef HAVE_DTLS
@@ -198,11 +198,10 @@ static struct
 static qboolean Init_GNUTLS(void)
 {
 #ifdef GNUTLS_DYNAMIC
-
 	dllfunction_t functable[] =
 	{
 #define GNUTLS_FUNC(nam,ret,args) {(void**)&q##nam, #nam},
-#define GNUTLS_FUNCPTR(nam,ret,args) {(void**)&q##nam, #nam},
+#define GNUTLS_FUNCPTR(nam,ret,arglist,calllist) {(void**)&q##nam, #nam},
 		GNUTLS_FUNCS
 #undef GNUTLS_FUNC
 #undef GNUTLS_FUNCPTR
@@ -434,7 +433,7 @@ static int QDECL SSL_CheckCert(gnutls_session_t session)
 #ifdef _DEBUG
 				for (j = 0, offset = 0; j < certcount; j++)
 					offset += certlist[j].size;
-				Con_Printf("%s cert %zu bytes (chain %u)\n", file->certname, offset, certcount);
+				Con_Printf("%s cert %"PRIuSIZE" bytes (chain %u)\n", file->certname, offset, certcount);
 				Con_Printf("/*%s*/\"", file->certname);
 				for (j = 0; file->certname[j]; j++)
 					Con_Printf("\\x%02x", file->certname[j]^0xff);
@@ -551,8 +550,10 @@ static int QDECL SSL_CheckFingerprint(gnutls_session_t session)
 
 		if (!memcmp(digest, file->peerdigest, file->peerhashfunc->digestsize))
 			return 0;
+		Con_Printf(CON_ERROR "%s: certificate chain (%i) does not match fingerprint\n", *file->certname?file->certname:"<anon>", certcount);
 	}
-	Con_Printf(CON_ERROR "%s: rejecting certificate\n", file->certname);
+	else
+		Con_Printf(CON_ERROR "%s: peer did not provide any certificate\n", *file->certname?file->certname:"<anon>");
 	return GNUTLS_E_CERTIFICATE_ERROR;
 }
 #endif
@@ -822,22 +823,23 @@ static qboolean	servercertfail;
 static gnutls_datum_t cookie_key;
 #endif
 
-static vfsfile_t *SSL_OpenPrivKey(char *nativename, size_t nativesize)
+static vfsfile_t *SSL_OpenPrivKey(char *displayname, size_t displaysize)
 {
 #define privname "privkey.pem"
 	vfsfile_t *privf;
-	const char *mode = nativename?"wb":"rb";
+	const char *mode = displayname?"wb":"rb";
 	int i = COM_CheckParm("-privkey");
 	if (i++)
 	{
-		if (nativename)
-			Q_strncpyz(nativename, com_argv[i], nativesize);
+		if (displayname)
+			if (!FS_DisplayPath(com_argv[i], FS_SYSTEM, displayname, displaysize))
+				Q_strncpyz(displayname, com_argv[i], displaysize);
 		privf = FS_OpenVFS(com_argv[i], mode, FS_SYSTEM);
 	}
 	else
 	{
-		if (nativename)
-			if (!FS_NativePath(privname, FS_ROOT, nativename, nativesize))
+		if (displayname)
+			if (!FS_DisplayPath(privname, FS_ROOT, displayname, displaysize))
 				return NULL;
 
 		privf = FS_OpenVFS(privname, mode, FS_ROOT);
@@ -845,24 +847,24 @@ static vfsfile_t *SSL_OpenPrivKey(char *nativename, size_t nativesize)
 	return privf;
 #undef privname
 }
-static vfsfile_t *SSL_OpenPubKey(char *nativename, size_t nativesize)
+static vfsfile_t *SSL_OpenPubKey(char *displayname, size_t displaysize)
 {
 #define fullchainname "fullchain.pem"
 #define pubname "cert.pem"
 	vfsfile_t *pubf = NULL;
-	const char *mode = nativename?"wb":"rb";
+	const char *mode = displayname?"wb":"rb";
 	int i = COM_CheckParm("-pubkey");
 	if (i++)
 	{
-		if (nativename)
-			Q_strncpyz(nativename, com_argv[i], nativesize);
+		if (displayname)
+			Q_strncpyz(displayname, com_argv[i], displaysize);
 		pubf = FS_OpenVFS(com_argv[i], mode, FS_SYSTEM);
 	}
 	else
 	{
-		if (!pubf && (!nativename || FS_NativePath(fullchainname, FS_ROOT, nativename, nativesize)))
+		if (!pubf && (!displayname || FS_DisplayPath(fullchainname, FS_ROOT, displayname, displaysize)))
 			pubf = FS_OpenVFS(fullchainname, mode, FS_ROOT);
-		if (!pubf && (!nativename || FS_NativePath(pubname, FS_ROOT, nativename, nativesize)))
+		if (!pubf && (!displayname || FS_DisplayPath(pubname, FS_ROOT, displayname, displaysize)))
 			pubf = FS_OpenVFS(pubname, mode, FS_ROOT);
 	}
 	return pubf;
@@ -957,24 +959,24 @@ static qboolean SSL_LoadPrivateCert(gnutls_certificate_credentials_t cred)
 
 		if (priv.size && pub.size)
 		{
-			char fullname[MAX_OSPATH];
-			privf = SSL_OpenPrivKey(fullname, sizeof(fullname));
+			char displayname[MAX_OSPATH];
+			privf = SSL_OpenPrivKey(displayname, sizeof(displayname));
 			if (privf)
 			{
 				VFS_WRITE(privf, priv.data, priv.size);
 				VFS_CLOSE(privf);
-				Con_Printf("Wrote %s\n", fullname);
+				Con_Printf("Wrote %s\n", displayname);
 			}
 //			memset(priv.data, 0, priv.size);
 			(*qgnutls_free)(priv.data);
 			memset(&priv, 0, sizeof(priv));
 
-			pubf = SSL_OpenPubKey(fullname, sizeof(fullname));
+			pubf = SSL_OpenPubKey(displayname, sizeof(displayname));
 			if (pubf)
 			{
 				VFS_WRITE(pubf, pub.data, pub.size);
 				VFS_CLOSE(pubf);
-				Con_Printf("Wrote %s\n", fullname);
+				Con_Printf("Wrote %s\n", displayname);
 			}
 			(*qgnutls_free)(pub.data);
 			memset(&pub, 0, sizeof(pub));
@@ -1085,8 +1087,8 @@ qboolean SSL_InitGlobal(qboolean isserver)
 			char keyfile[MAX_OSPATH];
 			char certfile[MAX_OSPATH];
 			*keyfile = *certfile = 0;
-			if (FS_NativePath("key.pem", FS_ROOT, keyfile, sizeof(keyfile)))
-				if (FS_NativePath("cert.pem", FS_ROOT, certfile, sizeof(certfile)))
+			if (FS_SystemPath("key.pem", FS_ROOT, keyfile, sizeof(keyfile)))
+				if (FS_SystemPath("cert.pem", FS_ROOT, certfile, sizeof(certfile)))
 					ret = qgnutls_certificate_set_x509_key_file(xcred[isserver], certfile, keyfile, GNUTLS_X509_FMT_PEM);
 			if (ret < 0)
 			{
@@ -1127,6 +1129,13 @@ void GnuTLS_Shutdown(void)
 
 			qgnutls_global_deinit();	//refcounted.
 		}
+#ifdef HAVE_DTLS
+	if (cookie_key.data)
+	{
+		(*qgnutls_free)(cookie_key.data);
+		memset(&cookie_key, 0, sizeof(cookie_key));
+	}
+#endif
 #ifdef GNUTLS_DYNAMIC
 	if (gnutls.hmod)
 		Sys_CloseLibrary(gnutls.hmod);
diff --git a/engine/common/net_ssl_winsspi.c b/engine/common/net_ssl_winsspi.c
index 59ffe8fbf..adf8068a5 100644
--- a/engine/common/net_ssl_winsspi.c
+++ b/engine/common/net_ssl_winsspi.c
@@ -765,7 +765,7 @@ static PCCERT_CONTEXT SSPI_GetServerCertificate(void)
 		);
 	}
 	if (!ret)
-		Con_Printf(CON_ERROR"Certificate generation failed...\n");
+		Con_Printf(CON_ERROR"SChannel: Certificate generation failed...\n");	//happens in wine.
 	else
 	{
 		//this is stupid and redundant, yet apparently still needed.
diff --git a/engine/common/net_wins.c b/engine/common/net_wins.c
index 2488173bf..8eeac2231 100644
--- a/engine/common/net_wins.c
+++ b/engine/common/net_wins.c
@@ -77,7 +77,7 @@ FTE_ALIGN(4) qbyte		net_message_buffer[MAX_OVERALLMSGLEN];
 #if defined(HAVE_IPV4) && defined(HAVE_SERVER)
 	#define HAVE_NATPMP
 #endif
-#if (defined(Q2CLIENT) || defined(Q2SERVER)) && (defined(HAVE_CLIENT) || defined(HAVE_SERVER)) && defined(HAVE_DTLS)	//q2e's lobby/tunnel crap
+#if (defined(Q2CLIENT) || defined(Q2SERVER)) && (defined(HAVE_CLIENT) || defined(HAVE_SERVER)) && defined(HAVE_DTLS) && defined(HAVE_PACKET)	//q2e's lobby/tunnel crap
 	#define KEXLOBBY "q2e"	//enables the feature, and defines the name of the sceme we use for it.
 #ifdef HAVE_SERVER
 cvar_t	net_enable_kexlobby			= CVARD("net_enable_"KEXLOBBY,			"0", "If enabled, accept connection requests from the quake2-remaster engine on our listening udp ports.\nNote that this defaults to disabled due to it being highly vulnerable to applification attacks.");
@@ -104,6 +104,7 @@ cvar_t	net_ice_broker			= CVARFD("net_ice_broker", "tls://master.frag-net.com:27
 cvar_t	timeout					= CVARD("timeout","65", "Connections will time out if no packets are received for this duration of time.");		// seconds without any message
 cvar_t	net_hybriddualstack		= CVARD("net_hybriddualstack",		"1", "Uses hybrid ipv4+ipv6 sockets where possible. Not supported on xp or below.");
 cvar_t	net_fakeloss			= CVARFD("net_fakeloss",			"0", CVAR_CHEAT, "Simulates packetloss in both receiving and sending, on a scale from 0 to 1.");
+cvar_t	net_fakemtu				= CVARFD("net_fakemtu",				"0", CVAR_CHEAT, "Cripples packet reception sizes.");
 static cvar_t net_dns_ipv4		= CVARD("net_dns_ipv4",				"1", "If 0, disables dns resolution of names to ipv4 addresses (removing any associated error messages). Also hides ipv4 addresses in address:port listings.");
 static cvar_t net_dns_ipv6		= CVARD("net_dns_ipv6",				"1", "If 0, disables dns resolution of names to ipv6 addresses (removing any associated error messages). Also hides ipv6 addresses in address:port listings.");
 cvar_t	net_enabled				= CVARD("net_enabled",				"1", "If 0, disables all network access, including name resolution and socket creation. Does not affect loopback/internal connections.");
@@ -120,7 +121,7 @@ cvar_t	net_enable_qizmo		= CVARD("net_enable_qizmo",			"1", "Enables serverside
 cvar_t	net_enable_qtv			= CVARD("net_enable_qtv",			"2", "Controls whether inbound qtv requests will be honoured (both proxies and clients using qtvplay).\n0: Don't accept qtv connections.\n1: Accept connections.\n2: Accept qtv connections only from host-scopped addresses (read: 127.*.*.*, ::1, or unix sockets).");
 #endif
 #if defined(HAVE_SSL)
-cvar_t	net_enable_tls			= CVARD("net_enable_tls",			"0", "If enabled, binary data sent to a non-tls tcp port will be interpretted as a tls handshake (enabling https or wss over the same tcp port.");
+cvar_t	net_enable_tls			= CVARD("net_enable_tls",			"1", "If enabled, binary data sent to a non-tls tcp port will be interpretted as a tls handshake (enabling https or wss over the same tcp port.");
 #endif
 #ifdef HAVE_HTTPSV
 #ifdef SV_MASTER
@@ -157,7 +158,7 @@ static void QDECL NET_Enable_DTLS_Changed(struct cvar_s *var, char *oldvalue)
 		char digest[DIGEST_MAXSIZE];
 		certsize = (svs.sockets&&svs.sockets->dtlsfuncs)?svs.sockets->dtlsfuncs->GetPeerCertificate(NULL, QCERT_LOCALCERTIFICATE, cert, sizeof(cert)):-1;
 		if (certsize > 0)
-			InfoBuf_SetStarBlobKey(&svs.info, "*fp", cert, Base64_EncodeBlockURI(digest, CalcHash(&hash_sha2_256, digest, sizeof(digest), cert, certsize), cert, sizeof(cert)));
+			InfoBuf_SetStarBlobKey(&svs.info, "*fp", cert, Base64_EncodeBlockURI(digest, CalcHash(&hash_certfp, digest, sizeof(digest), cert, certsize), cert, sizeof(cert)));
 		else
 			InfoBuf_SetStarKey(&svs.info, "*fp", "");
 	}
@@ -183,23 +184,6 @@ extern cvar_t sv_public, sv_listen_qw, sv_listen_nq, sv_listen_dp;
 extern cvar_t sv_listen_q3;
 #endif
 
-#define	MAX_LOOPBACK	64
-typedef struct
-{
-	qbyte	*data;
-	int		datalen;
-	int		datamax;
-} loopmsg_t;
-
-typedef struct
-{
-	qboolean	inited;
-	loopmsg_t	msgs[MAX_LOOPBACK];
-	int			get, send;
-} loopback_t;
-
-loopback_t	loopbacks[2];
-
 
 #ifdef HAVE_DTLS
 static neterr_t FTENET_DTLS_SendPacket(ftenet_connections_t *col, int length, const void *data, netadr_t *to);
@@ -214,11 +198,11 @@ ftecrypto_t *cryptolib[cryptolib_count] =
 	NULL,
 	NULL,
 	NULL,
-#ifdef HAVE_WINSSPI
-	&crypto_sspi,
-#endif
 #ifdef HAVE_GNUTLS
-	&crypto_gnutls,
+	&crypto_gnutls,	//generally works best, but statically linked
+#endif
+#ifdef HAVE_WINSSPI
+	&crypto_sspi,	//generally unreliable
 #endif
 };
 #if defined(HAVE_SSL)
@@ -238,13 +222,13 @@ static void NET_TLS_Provider_Changed(struct cvar_s *var, char *oldvalue)
 		Con_Printf("%s: \"%s\" not loaded, valid values are:", var->name, var->string);
 		for (i = 0; i < cryptolib_count; i++)
 			if (cryptolib[i])
-				Con_Printf(" %s", cryptolib[i]->drivername);
+				Con_Printf(" ^[%s\\type\\%s %s^]", cryptolib[i]->drivername, var->name, cryptolib[i]->drivername);
 		Con_Printf("\n");
 	}
 
 #if defined(HAVE_DTLS) && defined(HAVE_SERVER)
 	if (net_enable_dtls.string)	//might not be registered yet...
-		Cvar_ForceCallback(&net_enable_dtls);
+		Cvar_ForceCallback(&net_enable_dtls);	//note: any active connections will continue using their old contexts, but this will change the *fp serverinfo to the new provider's public key.
 #endif
 }
 #endif
@@ -276,6 +260,51 @@ qboolean NET_RegisterCrypto(void *module, ftecrypto_t *driver)
 	}
 }
 
+#ifdef _DEBUG
+static void TLS_Provider_Test_f(void)
+{
+	int i;
+	ftecrypto_t *crypt;
+
+	size_t certsize, hashsize, sigsize;
+	void *cert = Auth_GetKnownCertificate("Spike", &certsize);
+
+	char rnd[512/8+64];
+	char sig[384+64];
+
+	hashsize = Base16_DecodeBlock("23edbbe92c4f54d1f0f2adf34de9e1bd9b9b1906c28b6d0e4a8a77205820add5bc8a36bd31c786be924a8f62f74dce736d439a311c6d74741af169e94405e8c3", rnd,sizeof(rnd));
+	sigsize = Base64_DecodeBlock("HkV0N+sfHvGywhqwl7SCu0xTSin0pnp00XOw98rH5lXpGfFab2Gg/TFZKW/DwLoqdS7xIfl7RRxoSIxUmVk4MaxWCn4SuauoB+hf7dA5QAJuuJhxciwHUviqAHfZPBWm65Za1DKYRxOLd4i6/XWAtVZLnv+DhVOSf68cAwCjnCGZf1lFCQhPx96jRqK57U0Oux+DVdCfQYSJAUv/TQrFRIUmrW0wBnt1xaG+AfXsnEY7vdFme+AFtUsPTy+I5HWFKgu/8UsRcLs3Bvd1mFYgmC76hp3oSl+u152CBSFBO7mc6UPYbCVI8QC5BxE76pT3MXLX1nZXIbzKviAT5UwKAUk2fI1ZHJo2gYvjf0OkZ1CSaPJElKAublMHMwrT9Pqk8nqYWfWtfbu2/hXPWq5Pm2szgB4nO32B1sqfWhwkdFTL6U0cyzzUaw1v5DviupGsDaNu/yad0Zq7xq6YlIpOcN+R9QXhu4uijhdUaHmEecO6su5TW9go7bCufwohScX4", NULL, sig,sizeof(sig));
+
+	for (i = 0; i < cryptolib_count; i++)
+	{
+		crypt = cryptolib[i];
+		if (!crypt)
+			continue;
+
+		Con_Printf("Testing Provider %s%s:\n", crypt->drivername, (i==tls_provider.ival-1)?"(forced)":"");
+
+		if (crypt->GenerateSignature)
+			Con_Printf(S_COLOR_GREEN"	Able to sign\n");
+		else
+			Con_Printf(S_COLOR_YELLOW"	Unable to sign\n");
+
+//doesn't actually return the public certificate - the authority is kinda hardcoded right now. so don't bother testing it.
+//(only really needed for signing releases so it only working with gnutls isn't actually an issue)
+//		if (crypt->GenerateSignature)
+//			crypt->GenerateSignature(rnd,sizeof(rnd), sig,sizeof(sig));
+
+		switch(crypt->VerifyHash?crypt->VerifyHash(rnd,hashsize, cert,certsize, sig,sigsize):VH_UNSUPPORTED)
+		{
+		case VH_UNSUPPORTED:		Con_Printf(S_COLOR_RED	"	VH_UNSUPPORTED\n");			break;
+		case VH_AUTHORITY_UNKNOWN:	Con_Printf(S_COLOR_RED	"	VH_AUTHORITY_UNKNOWN\n");	break;
+		case VH_INCORRECT:			Con_Printf(S_COLOR_RED	"	VH_INCORRECT\n");			break;
+		case VH_CORRECT:			Con_Printf(S_COLOR_GREEN"	VH_CORRECT\n");				break;
+		default:					Con_Printf(S_COLOR_RED	"	VH_???\n");					break;
+		}
+	}
+}
+#endif
+
 //=============================================================================
 
 int NetadrToSockadr (netadr_t *a, struct sockaddr_qstorage *s)
@@ -430,6 +459,8 @@ qboolean NET_AddrIsReliable(netadr_t *adr)	//hints that the protocol is reliable
 	case NP_DGRAM:
 	case NP_DTLS:
 	case NP_NATPMP:
+	case NP_RTC_TCP:	//dtls makes it capable of reliability
+	case NP_RTC_TLS:	//dtls makes it capable of reliability
 	default:
 		return false;
 	case NP_KEXLAN: //provides its own reliability (at least for packets with the 'reliable' netchan flag set)
@@ -551,6 +582,8 @@ qboolean	NET_CompareAdr (netadr_t *a, netadr_t *b)
 #ifdef SUPPORT_ICE
 	if (a->type == NA_ICE)
 	{
+		if (a->port != b->port)
+			return false;
 		if (!strcmp(a->address.icename, b->address.icename))
 			return true;
 		return false;
@@ -1588,6 +1621,11 @@ static const struct urischeme_s urischemes[] =
 	{"wss://",	NP_WSS,		NA_INVALID,	true},
 	{"tls://",	NP_TLS,		NA_INVALID},
 	#endif
+#elif defined(HAVE_WEBSOCKCL)
+	{"ws://",	NP_WS,		NA_WEBSOCKET, true},
+	{"wss://",	NP_WSS,		NA_WEBSOCKET, true},
+	{"tcp://",	NP_WS,		NA_WEBSOCKET, true},	//fake it
+	{"tls://",	NP_WSS,		NA_WEBSOCKET, true},	//fake it
 #endif
 #ifdef HAVE_DTLS
 	{"dtls://",	NP_DTLS,	NA_INVALID},
@@ -1605,9 +1643,9 @@ static const struct urischeme_s urischemes[] =
 #endif
 
 #ifdef UNIXSOCKETS
-	{"udg://",	NP_DGRAM,	NA_UNIX},
+	{"udg://",	NP_DGRAM,	NA_UNIX, true},
 	#ifdef TCPCONNECT
-	{"unix://",	NP_STREAM,	NA_UNIX},
+	{"unix://",	NP_STREAM,	NA_UNIX, true},
 	#endif
 #endif
 };
@@ -1671,25 +1709,14 @@ size_t	NET_StringToAdr2 (const char *s, int defaultport, netadr_t *a, size_t num
 #ifdef HAVE_WEBSOCKCL
 	//with websockets we can't really resolve anything. failure happens only when trying to connect.
 	//`connect /GAMENAME` is equivelent to `connect rtc://broker/GAMENAME`
-	if (*s == '/')
-	{
-		if (!*net_ice_broker.string)
-		{	//FIXME: use referrer? or the website's host?
-			Con_DPrintf("No default rtc broker\n");
-			return 0;	//can't accept it
-		}
-		a->prot = NP_RTC_TLS;
-		a->type = NA_INVALID;
-
-		if (pathstart)
-			*pathstart = s;
-		return 1;
-	}
-	else if (!strncmp (s, "rtc://", 6) || !strncmp (s, "rtcs://", 7) || !strncmp (s, "ice://", 6) || !strncmp (s, "ices://", 7))
+	if (*s == '/' || !strncmp (s, "rtc://", 6) || !strncmp (s, "rtcs://", 7) || !strncmp (s, "ice://", 6) || !strncmp (s, "ices://", 7))
 	{	//basically ICE using sdp-via-websockets to a named relay server.
 		const char *path;
 		a->prot = NP_RTC_TLS;
-		if (s[4] == ':')
+		a->type = NA_WEBSOCKET;
+		if (*s == '/')
+			;
+		else if (s[4] == ':')
 		{
 			a->prot = NP_RTC_TLS;
 			s += 7;
@@ -1700,12 +1727,20 @@ size_t	NET_StringToAdr2 (const char *s, int defaultport, netadr_t *a, size_t num
 			s += 6;
 		}
 
-		path = strchr(s, '/');
+		if (*s == '/')
+		{	//if the broker was omitted then we're using the net_ice_broker cvar... track its security instead...
+			if (!strncmp(net_ice_broker.string, "tls://", 6) || !strncmp(net_ice_broker.string, "wss://", 6))
+				a->prot=NP_RTC_TLS;
+			else if (!strncmp(net_ice_broker.string, "tcp://", 6) || !strncmp(net_ice_broker.string, "ws://", 5))
+				a->prot=NP_RTC_TCP;
+			else
+				return 0;	//no default broker, don't allow it.
+		}
+
+		path = s+strlen(s);
 		if (path)
 		{
-			if (s == path)	//no hostname specified = use default broker (resolving it later)
-				a->type = NA_INVALID;
-			else if (path-s < sizeof(a->address.websocketurl))
+			if (path-s < sizeof(a->address.websocketurl))
 			{
 				memcpy(a->address.websocketurl, s, path-s);
 				a->address.websocketurl[path-s] = 0;
@@ -1715,8 +1750,6 @@ size_t	NET_StringToAdr2 (const char *s, int defaultport, netadr_t *a, size_t num
 				Con_DPrintf("Path too long\n");
 				return 0;	//too long
 			}
-			if (pathstart)
-				*pathstart = path;
 		}
 		else
 		{
@@ -1737,7 +1770,7 @@ size_t	NET_StringToAdr2 (const char *s, int defaultport, netadr_t *a, size_t num
 	}
 	else if (*net_ice_broker.string)
 	{
-		a->type = NA_INVALID;	//not quite right, but w/e.
+		a->type = NA_WEBSOCKET;	//figure it out later, to keep it more readable.
 		a->prot = NP_RTC_TLS;
 		Q_snprintfz(a->address.websocketurl, sizeof(a->address.websocketurl), "/udp/%s", s);
 //		if (numaddresses < 2)
@@ -1838,6 +1871,10 @@ size_t	NET_StringToAdr2 (const char *s, int defaultport, netadr_t *a, size_t num
 
 			if (prot == NP_RTC_TCP || prot == NP_RTC_TLS)
 				defaultport = PORT_ICEBROKER;
+			else if (prot == NP_WSS)
+				defaultport = 443;
+			else if (prot == NP_WS)
+				defaultport = 80;
 			break;
 		}
 	}
@@ -2687,6 +2724,22 @@ int TLS_GetChannelBinding(vfsfile_t *stream, qbyte *data, size_t *datasize)
 //loopback stuff
 
 #if defined(HAVE_SERVER) && defined(HAVE_CLIENT)
+#define	MAX_LOOPBACK	64
+typedef struct
+{
+	qbyte	*data;
+	int		datalen;
+	int		datamax;
+} loopmsg_t;
+
+typedef struct
+{
+	qboolean	inited;
+	loopmsg_t	msgs[MAX_LOOPBACK];
+	int			get, send;
+} loopback_t;
+
+static loopback_t	loopbacks[2];
 
 static qboolean	NET_GetLoopPacket (int sock, netadr_t *from, sizebuf_t *message)
 {
@@ -2732,6 +2785,12 @@ static neterr_t NET_SendLoopPacket (int sock, int length, const void *data, neta
 	loopback_t	*loop;
 	if (!length && !data)	//NET_EnsureRoute tests.
 		return NETERR_SENT;
+	if (length > sizeof(net_message_buffer))
+		return NETERR_MTU;	//reader probably won't be able to make sense of it if its too big...
+
+	if (net_fakemtu.ival)
+		if (length > abs(net_fakemtu.ival))
+			return (net_fakemtu.ival < 0)?NETERR_MTU:NETERR_SENT;
 
 	sock &= 1;
 
@@ -2747,7 +2806,10 @@ static neterr_t NET_SendLoopPacket (int sock, int length, const void *data, neta
 		loop->msgs[i].data = BZ_Malloc(loop->msgs[i].datamax);
 	}
 	if (loop->msgs[i].datalen)
-		Con_Printf("Warning: loopback queue overflow\n");
+	{
+		static float throttle;
+		Con_ThrottlePrintf(&throttle, 0, "Warning: loopback queue overflow\n");
+	}
 
 	loop->send++;
 
@@ -3178,6 +3240,9 @@ const dtlsfuncs_t *DTLS_InitServer(void)
 	{
 		f = !cryptolib[tls_provider.ival-1]->DTLS_InitServer?NULL:cryptolib[tls_provider.ival-1]->DTLS_InitServer();
 		provname = cryptolib[tls_provider.ival-1]->drivername;
+
+		if (!f)
+			Con_Printf("DTLS provider %s failed\n", provname);
 	}
 	else for (i = 0; !f && i < cryptolib_count; i++)
 	{
@@ -3186,7 +3251,7 @@ const dtlsfuncs_t *DTLS_InitServer(void)
 			f = cryptolib[i]->DTLS_InitServer();
 			provname = cryptolib[i]->drivername;
 			if (!f)
-				Con_Printf("DTLS provider %s failed\n", cryptolib[i]->drivername);
+				Con_Printf("DTLS provider %s failed\n", provname);
 		}
 	}
 	if (f)
@@ -3198,11 +3263,19 @@ const dtlsfuncs_t *DTLS_InitClient(void)
 	const dtlsfuncs_t *f = NULL;
 	int i;
 	if (tls_provider.ival>0 && tls_provider.ival <= cryptolib_count && cryptolib[tls_provider.ival-1])
+	{
 		f = !cryptolib[tls_provider.ival-1]->DTLS_InitClient?NULL:cryptolib[tls_provider.ival-1]->DTLS_InitClient();
+		if (!f)
+			Con_Printf("DTLS provider %s failed\n", cryptolib[tls_provider.ival-1]->drivername);
+	}
 	else for (i = 0; !f && i < cryptolib_count; i++)
 	{
 		if (cryptolib[i] && cryptolib[i]->DTLS_InitClient)
+		{
 			f = cryptolib[i]->DTLS_InitClient();
+			if (!f)
+				Con_DPrintf("DTLS provider %s failed\n", cryptolib[i]->drivername);
+		}
 	}
 	return f;
 }
@@ -3510,11 +3583,13 @@ qboolean FTENET_AddToCollection(ftenet_connections_t *col, const char *name, con
 #endif
 #if defined(TCPCONNECT) && defined(HAVE_IPV4)
 		if (adr[i].prot == NP_WS	&& adr[i].type == NA_IP)	establish[i] = FTENET_TCP_EstablishConnection;	else
+		if (adr[i].prot == NP_WSS	&& adr[i].type == NA_IP)	establish[i] = FTENET_TCP_EstablishConnection;	else
 		if (adr[i].prot == NP_STREAM&& adr[i].type == NA_IP)	establish[i] = FTENET_TCP_EstablishConnection;	else
 		if (adr[i].prot == NP_TLS	&& adr[i].type == NA_IP)	establish[i] = FTENET_TCP_EstablishConnection;	else
 #endif
 #if defined(TCPCONNECT) && defined(HAVE_IPV6)
 		if (adr[i].prot == NP_WS	&& adr[i].type == NA_IPV6)	establish[i] = FTENET_TCP_EstablishConnection;	else
+		if (adr[i].prot == NP_WSS	&& adr[i].type == NA_IPV6)	establish[i] = FTENET_TCP_EstablishConnection;	else
 		if (adr[i].prot == NP_STREAM&& adr[i].type == NA_IPV6)	establish[i] = FTENET_TCP_EstablishConnection;	else
 		if (adr[i].prot == NP_TLS	&& adr[i].type == NA_IPV6)	establish[i] = FTENET_TCP_EstablishConnection;	else
 #endif
@@ -3990,13 +4065,13 @@ neterr_t FTENET_Datagram_SendPacket(ftenet_generic_connection_t *con, int length
 
 		{
 			char adr[256];
-			if (ecode==NET_ENETUNREACH&&to->type==NA_IPV6)	//ipv6 support STILL sucks too much. don't spam non-developers, its just annoying.
-				Con_DPrintf(S_COLOR_GRAY"%s - Warning: %i\n", NET_AdrToString (adr, sizeof(adr), to), ecode);
+			if (ecode==NET_ENETUNREACH)	//ipv6 support STILL sucks too much. don't spam non-developers, its just annoying.
+				return NETERR_NOROUTE;
 #ifdef HAVE_CLIENT
 			else if (ecode == NET_EADDRNOTAVAIL || (ecode==NET_ENETUNREACH&&to->type==NA_IPV6))
 				Con_DPrintf(S_COLOR_GRAY"%s - Warning: %i\n", NET_AdrToString (adr, sizeof(adr), to), ecode);
-			else
 #endif
+			else
 			{
 #ifdef _WIN32
 				Con_Printf (S_COLOR_GRAY"%s - ERROR: %i\n", NET_AdrToString (adr, sizeof(adr), to), ecode);
@@ -4405,10 +4480,10 @@ enum kexlobby_type_e
 	KEXLAN_NEWCONNECTION=0x80,	//both request+response.
 	KEXLAN_KEEPALIVE=0x81,		//I *THINK* this is a keepalive.
 	KEXLAN_ACK=0x82,
-	KEXLAN_LOBBDYCHAT=0xfc,
-	KEXLAN_LOBBDYPLAYER=0xfd,
-	KEXLAN_LOBBDYCOMMAND=0xfe,
-	KEXLAN_LOBBDYRULE=0xff
+	KEXLAN_LOBBYCHAT=0xfc,
+	KEXLAN_LOBBYPLAYER=0xfd,
+	KEXLAN_LOBBYCOMMAND=0xfe,
+	KEXLAN_LOBBYRULE=0xff
 };
 static neterr_t  NET_KexLobby_SendMessage(struct kexcon_s *peer, int type, const void *data, size_t length)
 {
@@ -4534,17 +4609,19 @@ static neterr_t  NET_KexLobby_SendMessage(struct kexcon_s *peer, int type, const
 		peer->nextping = realtime + 0.3;	//set a timeout for it to be flushed.
 	return NETERR_SENT;
 }
+#ifdef HAVE_SERVER
 static neterr_t  NET_KexLobby_SendMessageZ(struct kexcon_s *peer, int type, const char *data)
 {
 	return NET_KexLobby_SendMessage(peer, type, data, strlen(data));
 }
+#endif
 static neterr_t NET_KexLobby_SendChat(struct kexcon_s *peer, int seat, const char *text)
 {
 	char pkt[2+256];
 	pkt[0] = peer->plidx[seat];
 	pkt[1] = strlen(text);
 	memcpy(pkt+2, text, pkt[1]);
-	return NET_KexLobby_SendMessage(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBDYCHAT, pkt, 2 + pkt[1]);
+	return NET_KexLobby_SendMessage(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBYCHAT, pkt, 2 + pkt[1]);
 }
 #ifdef HAVE_CLIENT
 static neterr_t NET_KexLobby_CLSetPlayerInfo(struct kexcon_s *peer, int seat, const char *info)
@@ -4553,7 +4630,7 @@ static neterr_t NET_KexLobby_CLSetPlayerInfo(struct kexcon_s *peer, int seat, co
 	pkt[0] = seat;
 	pkt[1] = strlen(info);
 	memcpy(pkt+2, info, pkt[1]);
-	return NET_KexLobby_SendMessage(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBDYPLAYER, pkt, 2 + pkt[1]);
+	return NET_KexLobby_SendMessage(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBYPLAYER, pkt, 2 + pkt[1]);
 }
 #endif
 #ifdef HAVE_SERVER
@@ -4565,16 +4642,14 @@ static neterr_t NET_KexLobby_SVSetPlayerInfo(struct kexcon_s *peer, int plid, co
 	if (!info) info = "";
 	pkt[2] = strlen(info);
 	memcpy(pkt+3, info, pkt[2]);
-	return NET_KexLobby_SendMessage(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBDYPLAYER, pkt, 3 + pkt[2]);
+	return NET_KexLobby_SendMessage(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBYPLAYER, pkt, 3 + pkt[2]);
 }
 #endif
-#ifdef HAVE_SERVER
 static void NET_KexLobby_Ack(struct kexcon_s *peer, int rseq)
 {
 	char pkt[3] = {0x00,rseq>>8, rseq};
 	NET_KexLobby_SendMessage(peer, KEXLAN_NAGGLE|KEXLAN_ACK, pkt, sizeof(pkt));
 }
-#endif
 
 static void NET_KexLobby_DestroyContext(void *ctx)
 {
@@ -4583,7 +4658,7 @@ static void NET_KexLobby_DestroyContext(void *ctx)
 	int i;
 
 	//let the server know to kill the client too (serverside will notice soon enough). should probably send a couple
-	NET_KexLobby_SendMessage(peer, KEXLAN_LOBBDYCOMMAND, "\x0a""disconnect", 11);
+	NET_KexLobby_SendMessage(peer, KEXLAN_LOBBYCOMMAND, "\x0a""disconnect", 11);
 
 	while ((queue=peer->resendqueue))
 	{	//would could have been is never to be.
@@ -4621,16 +4696,16 @@ static void * NET_KexLobby_CreateContext(const dtlscred_t *credinfo, void *cbctx
 		peer->plidx[2] = 3;
 		peer->plidx[3] = 4;
 
-		NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBDYRULE, va("map\\%s", sv.mapname));
+		NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBYRULE, va("map\\%s", sv.mapname));
 		// NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBDYRULE, "_savedgamename\\");
 		// NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBDYRULE, "_savedgame\\0");
 		if (deathmatch.value)
-			NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBDYRULE, "gamemode\\$m_deathmatch");
+			NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBYRULE, "gamemode\\$m_deathmatch");
 		else
-			NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBDYRULE, "gamemode\\$m_coop");
-		// NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBDYRULE, "ingame\\0");
-		// NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBDYRULE, "_maplist\\0");
-		// NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBDYRULE, "q2game\\baseq2");
+			NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBYRULE, "gamemode\\$m_coop");
+		// NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBYRULE, "ingame\\0");
+		// NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBYRULE, "_maplist\\0");
+		// NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBYRULE, "q2game\\baseq2");
 
 		NET_KexLobby_SVSetPlayerInfo(peer, 0, va("playername\\"DISTRIBUTION" - %s", hostname.string));	//always give a name for the server, so Q2E doesn't bug out and make up its own thing.
 //		NET_KexLobby_SVSetPlayerInfo(peer, 0, "q2ent\\1");
@@ -4641,7 +4716,7 @@ static void * NET_KexLobby_CreateContext(const dtlscred_t *credinfo, void *cbctx
 //		NET_KexLobby_SVSetPlayerInfo(peer, peer->plidx[2], "playername\\Kinda You...");
 //		NET_KexLobby_SVSetPlayerInfo(peer, peer->plidx[3], "playername\\Partly you...");
 
-		NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBDYRULE, "ingame\\1");
+		NET_KexLobby_SendMessageZ(peer, KEXLAN_NAGGLE|KEXLAN_RELIABLE|KEXLAN_LOBBYRULE, "ingame\\1");
 		peer->state = KEXLOBBY_ESTABLISHED;
 #endif
 	}
@@ -4832,7 +4907,7 @@ static neterr_t NET_KexLobby_Received(void *ctx, sizebuf_t *message)
 			}
 //if (*ql)Con_Printf(S_COLOR_GRAY"Dupe Acked %x\n", useq);
 			break;
-		case KEXLAN_LOBBDYCHAT:	//player chat
+		case KEXLAN_LOBBYCHAT:	//player chat
 			p = *buf++;
 			if (peer->isserver)
 				p = peer->plidx[p];
@@ -4861,7 +4936,7 @@ static neterr_t NET_KexLobby_Received(void *ctx, sizebuf_t *message)
 					Con_Printf("\x01%s: %s\n", InfoBuf_ValueForKey(&peer->slot[p], "playername"), s);
 			}
 			break;
-		case KEXLAN_LOBBDYPLAYER:
+		case KEXLAN_LOBBYPLAYER:
 			if (peer->isserver)
 			{
 				ptype = 0;
@@ -4896,7 +4971,7 @@ static neterr_t NET_KexLobby_Received(void *ctx, sizebuf_t *message)
 			else
 				Con_ThrottlePrintf(&throttle, 0, "Unknown player update type\n");
 			break;
-		case KEXLAN_LOBBDYCOMMAND:
+		case KEXLAN_LOBBYCOMMAND:
 			l = *buf++;
 			csz = seqend-buf;
 			if (csz != l || csz >= sizeof(s))
@@ -4920,7 +4995,7 @@ static neterr_t NET_KexLobby_Received(void *ctx, sizebuf_t *message)
 			else
 				Con_ThrottlePrintf(&throttle, 0, KEXLOBBY": unrecognised command %s\n", s);
 			break;
-		case KEXLAN_LOBBDYRULE:
+		case KEXLAN_LOBBYRULE:
 #ifdef HAVE_CLIENT
 			if (csz < sizeof(s) && !peer->isserver)
 			{
@@ -5360,9 +5435,11 @@ neterr_t FTENET_TCP_WebSocket_Splurge(ftenet_tcp_stream_t *st, enum websocketpac
 		{
 			memmove(st->outbuffer, st->outbuffer + done, st->outlen - done);
 			st->outlen -= done;
+
+memset(st->outbuffer+st->outlen, 0, sizeof(st->outbuffer)-st->outlen);
 		}
 	}
-	return NETERR_SENT;
+	return NETERR_SENT;	//it might not have actually gone, but it'll go eventually...
 }
 
 #ifdef HAVE_HTTPSV
@@ -5549,33 +5626,152 @@ qboolean FTENET_TCP_HTTPResponse(ftenet_tcp_stream_t *st, httparg_t arg[WCATTR_C
 			;
 #endif
 #ifdef HAVE_SERVER
-		/*else if (!strcmp(name, "index.html"))
-		{
+		else if (!strcmp(name, "index.html"))
+		{			
 			resp = "HTTP/1.1 200 Ok\r\n"
 				"Content-Type: text/html\r\n";
 
 			body = va(
-				"<html lang='en-us'>"
-				"<head>"
-				"<meta charset='utf-8'>"
-				"<meta http-equiv='Content-Type' content='text/html; charset=utf-8'>"
-				"<meta name=viewport content='width=device-width, initial-scale=1'>"
-				"<link rel='icon' type='image/vnd.microsoft.icon' href='/favicon.ico' />"
-				"<title>%s - %s</title>"
-				"<style>"
-					"body { background-color:#000000; color:#808080; height:100%%;width:100%%;margin:0;padding:0;}"
-				"</style>"
-				"</head>"
-				"<body>"
-				"<iframe name='steve'"
-					" src='%s/%s?+connect%%20%s%s' allowfullscreen=true"
-					" frameborder='0' scrolling='no' marginheight='0' marginwidth='0' width='100%%' height='100%%'"
-					" onerror=\"alert('Failed to load engine')\">"
-				"</iframe>"
-				"</body>"
-				"</html>"
-				,fs_manifest->formalname, hostname.string, ENGINEWEBSITE, fs_manifest->installation, (st->remoteaddr.prot==NP_TLS)?"wss://":"ws://", arg[WCATTR_HOST]);
-		}*/
+				"<!DOCTYPE HTML>\n"
+				"<HTML><HEAD>"
+					"<meta charset='utf-8' />"
+					"<title>%s - %s</title>"
+					//"<link rel=\"StyleSheet\" href=\"/style.css\" type=\"text/css\" />\n"
+					"<style>"
+						"html,body { background-color:#000000; color:#808080; height:100%%;width:100%%;margin:0;padding:0;}"
+						".emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }"
+						"div.emscripten { text-align: center; padding:0; margin: 0;}"
+						"div.emscripten_border { padding:0; margin: 0; }"
+						/* the canvas *must not* have any border or padding, or mouse coords will be wrong */
+						"canvas.emscripten { border: 0px none; width:100%%; height:100%%; padding:0; margin: 0;}"
+					"</style>"
+				"</HEAD><body>"
+					"<div class='emscripten' id='status'>Please allow/unblock our javascript to play.</div>"
+					"<div class='emscripten'><progress value='0' max='100' id='progress' hidden=1></progress></div>"
+					"<canvas class='emscripten' id='canvas' oncontextmenu='event.preventDefault()' hidden=1>Canvas not supported<br/></canvas>"
+					"<script type='text/javascript'>"
+						"var Module = {"
+							"canvas: document.getElementById('canvas'),"
+							"print: function(msg)"
+							"{"
+								"console.log(msg);"
+							"},"
+							"printErr: function(text)"
+							"{"
+								"if (text.substr(0, 28) == 'Cannot enlarge memory arrays')"
+									"alert('Memory full/fragmented. Please reload the page.');"
+								"else "
+									"console.log(text);"
+							"},"
+							"setStatus: function(text)"
+							"{"   //gets spammed some prints during startup. blame emscripten.
+								"if (Module.setStatus.interval)"
+									"clearInterval(Module.setStatus.interval);"
+								"var m = text.match(/([^(]+)\\((\\d+(\\.\\d+)?)\\/(\\d+)\\)/);"
+								"var statusElement = document.getElementById('status');"
+								"var progressElement = document.getElementById('progress');"
+								"if (m) {"
+									"text = m[1];"
+									"progressElement.value = parseInt(m[2])*100;"
+									"progressElement.max = parseInt(m[4])*100;"
+									"progressElement.hidden = false;"
+								"} else {"
+									"progressElement.value = null;"
+									"progressElement.max = null;"
+									"progressElement.hidden = true;"
+								"}"
+								"statusElement.innerHTML = text;"
+								"statusElement.hidden = text.length==0;"
+							"},"
+							"totalDependencies: 0,"
+							"monitorRunDependencies: function(left)"
+							"{"   //progress is progress...
+								"this.totalDependencies = Math.max(this.totalDependencies, left);"
+								"Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');"
+							"},"
+							"arguments: ["
+								"'-nohome',"
+								"'-manifest',"
+								"'default.fmf',"
+								"'+connect',"
+								"(window.location.protocol=='https:'?'wss://':'ws://')+window.location.host"
+							"],"
+							"postRun:"
+							"["	//each of these are called after main was run. we should have our mainloop set up now
+								"function()"
+								"{"
+									"if (Module['sched'] === undefined)"
+									"{"	//our main function failed to set up the main loop. ie: main didn't get called. panic.
+										"alert('Unable to initialise. You may need to restart your browser. If you get this often and inconsistently, consider using a 64bit browser instead.');"
+										"Module.setStatus('Initialisation Failure');"
+									"}"
+								"}"
+							"],"
+						"};"
+
+						//create the script object
+						"var s = document.createElement('script');"
+						// set it up
+						"s.setAttribute('src','/ftewebgl.js');"
+						"s.setAttribute('type','text/javascript');"
+						"s.setAttribute('charset','utf-8');"
+						"s.addEventListener('error', function() {Module.setStatus('Unable to download engine javascript');alert('Error loading game script.');}, false);"
+						// add to DOM
+						"document.head.appendChild(s);"
+
+						//set up some functions that the embedded stuff can use
+						"parent.joinserver = function(d)"
+						"{"
+							"d = '\\nconnect '+d+'\\n';"
+							"FTEC.cbufadd(d);"
+						"};"
+						"parent.joinstream = function(d)"
+						"{"
+							"joinserver((window.location.protocol=='https:'?'wss://':'ws://')+window.location.host+'/'+d);"
+						"};"
+						"parent.playdemo = function(d)"
+						"{"
+							"alert('playdemo'+d);"
+						"};"
+					"</script>"
+					"<noscript>"
+						"It looks like you have javascript disabled.<br/>"
+						"If you want to run a javascript port of a game engine, it helps to have javascript enabled. Just saying.<br/>"
+						"<br/>"
+					"</noscript>"
+				"</body></HTML>"
+			,fs_manifest->formalname, hostname.string);
+		}
+		else if (!strcmp(name, "ftewebgl.js") || !strcmp(name, "ftewebgl.wasm") || !strcmp(name, "default.fmf"))
+		{
+			conchar_t musite[256], *e;
+			char site[256];
+			e = COM_ParseFunString(CON_WHITEMASK, ENGINEWEBSITE, musite, sizeof(musite), false);
+			COM_DeFunString(musite, e, site, sizeof(site)-1, true, true);
+			Q_strncatz(site, "/", sizeof(site));
+
+			st->dlfile = FS_OpenVFS(va("%s.gz", name), "rb", FS_ROOT);
+			if (st->dlfile)
+				extraheaders = "Content-Encoding: gzip\r\n";
+			else
+			{
+				extraheaders = "";
+				st->dlfile = FS_OpenVFS(name, "rb", FS_ROOT);
+			}
+			if (st->dlfile)
+			{	//if we have it locally then use it.
+				resp = NULL;
+				body = NULL;
+			}
+			else
+			{
+				resp = va(	"HTTP/1.1 302 Found\r\n"
+					"Location: %s%s\r\n"
+					"Content-Type: text/html\r\n"
+					, site, name);
+				body = "Please follow the redirect!";
+			}
+		}
 		/*else if (!strcmp(name, "default.fmf") && (st->dlfile = FS_OpenVFS("default.fmf", "rb", FS_ROOT)))
 		{
 			resp =	"HTTP/1.1 200 Ok\r\n"
@@ -5694,10 +5890,10 @@ qboolean FTENET_TCP_HTTPResponse(ftenet_tcp_stream_t *st, httparg_t arg[WCATTR_C
 
 					".mvd",		"application/x-multiviewdemo",
 					".mvd.gz",	"application/x-multiviewdemo",
-					".qwd",		"application/x-multiviewdemo",
-					".qwd.gz",	"application/x-multiviewdemo",
-					".dem",		"application/x-multiviewdemo",
-					".dem.gz",	"application/x-multiviewdemo",
+					".qwd",		"application/x-quakeworlddemo",
+					".qwd.gz",	"application/x-quakeworlddemo",
+					".dem",		"application/x-quakedemo",
+					".dem.gz",	"application/x-quakedemo",
 				};
 				ext = COM_GetFileExtension(name, NULL);
 				if (!strcmp(ext, ".gz")||!strcmp(ext, ".xz"))
@@ -6002,6 +6198,7 @@ static const char *FTENET_TCP_ParseHTTPRequest(ftenet_tcp_connection_t *con, fte
 				attr = WCATTR_TRANSFER_ENCODING;//in case they're trying to post/put complex stuff
 			else if (j-i == 13 && !strnicmp(&st->inbuffer[i], "If-None-Match", 13))
 				attr = WCATTR_IFNONEMATCH;//for clientside caches
+			//FIXME: X-Forwarded-For for _trusted_ wss proxies. use last-listed only, and only if sender is [127.0.0.1]/[::1]
 			else
 				attr = 0;
 
@@ -6110,19 +6307,51 @@ static const char *FTENET_TCP_ParseHTTPRequest(ftenet_tcp_connection_t *con, fte
 	if (!stricmp(arg[WCATTR_UPGRADE], "websocket") && (!stricmp(arg[WCATTR_CONNECTION], "Upgrade") || !stricmp(arg[WCATTR_CONNECTION], "keep-alive, Upgrade")))
 	{
 		int cltype;
-		//the choice of protocol affects the type of response that we give rather than anything mystic
-		if (!strcmp(arg[WCATTR_WSPROTO], "quake"))
-			cltype = TCPC_WEBSOCKETNQ;	//raw nq data, all reliable, for compat with webquake
-		else if (!strcmp(arg[WCATTR_WSPROTO], "rtc_client"))
-			cltype = TCPC_WEBRTC_CLIENT;//not a real client.
-		else if (!strcmp(arg[WCATTR_WSPROTO], "rtc_host"))
-			cltype = TCPC_WEBRTC_HOST;//not a real client, but a competing server! oh noes!
-		else if (!strcmp(arg[WCATTR_WSPROTO], "binary"))
-			cltype = TCPC_WEBSOCKETB;	//emscripten's networking libraries insists on 'binary', but we stopped using that a while back because its hostname->ip stuff was flawed.
-		else if (!strcmp(arg[WCATTR_WSPROTO], "fteqw"))
-			cltype = TCPC_WEBSOCKETB;	//specific custom protocol name to avoid ambiguities.
-		else
-			cltype = TCPC_WEBSOCKETU;	//nacl supports only utf-8 encoded data, at least at the time I implemented it.
+		char prot[64];
+		const char *p = arg[WCATTR_WSPROTO];
+		com_tokentype_t toktype;
+		const char *protoname = "";
+		static const struct
+		{
+			const char *name;
+			int tcpc;
+		} protonames[] = {	{"fteqw",TCPC_WEBSOCKETB},			//our standard-data-over-ws protocol. even challenges (they're used for extension handshakes)
+						//	{"binary",TCPC_WEBSOCKETB},			//older name for 'fteqw', from back when emscripten hardcoded stuff.
+							{"quake", TCPC_WEBSOCKETNQ},		//quirky mangled headers, no OOB, included purely for compat with netquake.io's servers.
+							{"rtc_client", TCPC_WEBRTC_CLIENT},	//an fte client trying to connect to a server.
+							{"rtc_host", TCPC_WEBRTC_HOST}};	//an fte server advertising itself.
+
+		cltype = TCPC_UNKNOWN;
+		while(*p)
+		{
+			int pidx;
+			p = COM_ParseTokenOut(p, ",", prot,sizeof(prot), &toktype);
+			if (toktype == TTP_LINEENDING || toktype == TTP_EOF)
+				break;
+			if (toktype == TTP_PUNCTUATION)
+				continue;
+			if (toktype == TTP_RAWTOKEN)
+			{
+				for (pidx = 0; pidx < countof(protonames); pidx++)
+				{
+					if (!strcmp(prot, protonames[pidx].name))
+					{
+						protoname = protonames[pidx].name;
+						cltype = protonames[pidx].tcpc;
+						break;
+					}
+				}
+
+				if (pidx < countof(protonames))
+				{	//found a match use it. favour the first listed like the docs say, unless its going to be misordered due to netquake.io's servers being shite.
+					if (cltype == TCPC_WEBSOCKETNQ)
+						continue;
+					break;
+				}
+			}
+		}
+		if (cltype == TCPC_UNKNOWN)
+			return "websocket protocol not specified/known";
 
 		if (cltype == TCPC_WEBRTC_CLIENT||cltype==TCPC_WEBRTC_HOST)
 		{
@@ -6152,7 +6381,6 @@ static const char *FTENET_TCP_ParseHTTPRequest(ftenet_tcp_connection_t *con, fte
 			char acceptkey[20*2];
 			unsigned char sha1digest[20];
 			char *blurgh;
-			char *protoname = "";
 			static int clientseq;
 
 			blurgh = va("%s258EAFA5-E914-47DA-95CA-C5AB0DC85B11", arg[WCATTR_WSKEY]);
@@ -6163,7 +6391,8 @@ static const char *FTENET_TCP_ParseHTTPRequest(ftenet_tcp_connection_t *con, fte
 			else
 				st->remoteaddr.prot = NP_WS;
 
-			protoname = (cltype==TCPC_WEBSOCKETU)?"":va("Sec-WebSocket-Protocol: %s\r\n", arg[WCATTR_WSPROTO]);
+			if (*protoname)
+				protoname = va("Sec-WebSocket-Protocol: %s\r\n", protoname);
 			st->clienttype = cltype;
 
 			switch(st->clienttype)
@@ -6282,6 +6511,7 @@ static const char *FTENET_TCP_ParseHTTPRequest(ftenet_tcp_connection_t *con, fte
 					{	//we don't use StringToAdr to avoid dns lookup stalls (denial of service attacks). should at least work for server browsers.
 #if defined(HAVE_DTLS) && defined(SV_MASTER)
 						struct dtlspeercred_s cred={NULL};
+						char adr2[256];
 						if (net_enable_dtls.ival)
 						{
 							if (!NET_StringToAdr_NoDNS(idstart+4, PORT_QWCLIENT, &st->webrtc.target))
@@ -6291,9 +6521,16 @@ static const char *FTENET_TCP_ParseHTTPRequest(ftenet_tcp_connection_t *con, fte
 
 #ifdef SV_MASTER
 							if (con->generic.owner == svm_sockets)
+							{
 								if (!SVM_FixupServerAddress(&st->webrtc.target, &cred))
 									return "target not registered";	//we don't know about this server...
+							}
+							else
+								return "request sent to wrong socket";	//wut?
 							//if the specified credentials, reject the connection if different.
+//#else
+							//if we can't filter it by known servers then we can at least spam.
+							Con_DPrintf(S_COLOR_GRAY"%s: brokering with %s\n", NET_AdrToString(adr, sizeof(adr), &st->remoteaddr), NET_AdrToString(adr2, sizeof(adr2), &st->webrtc.target));
 #endif
 
 							//use dtls to contact the server.
@@ -6310,7 +6547,7 @@ static const char *FTENET_TCP_ParseHTTPRequest(ftenet_tcp_connection_t *con, fte
 						}
 						else
 #endif
-							return "rdp-via-udp is not enabled on this broker";
+							return "sdp-via-udp is not enabled on this broker";
 					}
 					else
 					{	//find its server, if we can
@@ -6336,10 +6573,16 @@ static const char *FTENET_TCP_ParseHTTPRequest(ftenet_tcp_connection_t *con, fte
 				net_from = st->remoteaddr;
 				net_from.connum = con->generic.connum;
 				net_from_connection = &con->generic;
-				MSG_WriteLong(&net_message, LongSwap(NETFLAG_CTL | (strlen(NQ_NETCHAN_GAMENAME)+7)));
+				MSG_WriteLong(&net_message, LongSwap(NETFLAG_CTL | (strlen(NQ_NETCHAN_GAMENAME)+7+7)));
 				MSG_WriteByte(&net_message, CCREQ_CONNECT);
 				MSG_WriteString(&net_message, NQ_NETCHAN_GAMENAME);
 				MSG_WriteByte(&net_message, NQ_NETCHAN_VERSION);
+
+				MSG_WriteByte(&net_message, MOD_PROQUAKE); /*'mod'*/
+				MSG_WriteByte(&net_message, 34); /*'mod' version*/
+				MSG_WriteByte(&net_message, 0); /*flags*/
+				MSG_WriteLong(&net_message, 0); /*password*/
+
 				con->generic.owner->ReadGamePacket();
 			}
 			return NULL;
@@ -6433,6 +6676,11 @@ static qboolean FTENET_TCP_KillStream(ftenet_tcp_connection_t *con, ftenet_tcp_s
 	if (st->dlfile)
 		VFS_CLOSE(st->dlfile);
 
+#ifdef HAVE_SERVER
+	if (con->generic.islisten)
+		SV_DropClient_ByAddress(&st->remoteaddr);
+#endif
+
 #ifdef HAVE_HTTPSV
 	if (st->clienttype == TCPC_WEBRTC_CLIENT)
 	{	//notify its server
@@ -6583,14 +6831,14 @@ restart:	//gotos are evil. I am evil. live with it.
 					if (VFS_WRITE(st->clientstream, "qizmo\n", 6) != 6)
 						return "write error";	//unable to write for some reason.
 				}
-				return NULL;
+				goto restart;	//connected, next read will read the actual qizmo data
 			}
 			return "net_enable_qizmo";	//not enabled.
 		}
 
 		//check if we have some http-like protocol with a header that ends with two trailing new lines (carrage returns optional, at least here)
 		//(must have a full request header, meaning double-lineendings somewhere)
-		if (con->generic.islisten)// && !strncmp(st->inbuffer, "GET ", 4))
+//		if (con->generic.islisten)// && !strncmp(st->inbuffer, "GET ", 4))
 		{
 			//qtv or http request header. these terminate with a blank line.
 			int i = 0;
@@ -6614,7 +6862,15 @@ restart:	//gotos are evil. I am evil. live with it.
 					;
 			}
 
-			if (headerscomplete)
+			if (!headerscomplete)
+			{
+				//they splurged too much data and we don't even know what they were
+				//either way we're expecting a request header in our buffer that can never be completed
+				if (st->inlen >= sizeof(st->inbuffer)-1)
+					return "unknown";
+				return NULL;	//keep waiting for the rest of the headers.
+			}
+			else if (con->generic.islisten)
 			{
 #if defined(SUBSERVERS) && defined(HAVE_SERVER)
 				//this is a new subserver node...
@@ -6684,14 +6940,60 @@ restart:	//gotos are evil. I am evil. live with it.
 				}
 			}
 			else
-			{
-				//they splurged too much data and we don't even know what they were
-				//either way we're expecting a request header in our buffer that can never be completed
-				if (st->inlen >= sizeof(st->inbuffer)-1)
-					return "unknown";
+			{	//We're the _client_ in this block.
+#ifdef HAVE_HTTPSV	//wut? wtf?
+				if (!strncmp(st->inbuffer, "HTTP/1.1 101", 12))
+				{
+					char tok[64];
+					const char *prot;
+					st->inbuffer[i-1] = 0;
+					prot = strstr(st->inbuffer, "Sec-Websocket-Protocol: ");
+					if (prot)
+						COM_ParseOut(prot+24, tok, sizeof(tok));
+					else
+						COM_ParseOut("fteqw", tok, sizeof(tok));	//give it a sane default.
+					memmove(st->inbuffer, st->inbuffer+i, st->inlen - (i));
+					st->inlen -= i;
+
+					if (!strcmp(tok, "fteqw"))
+					{	//same as we send over udp, just over wss.
+						st->clienttype = TCPC_WEBSOCKETB;
+					}
+#ifdef NQPROT
+					else if (!strcmp(tok, "quake"))
+					{	//webquake.io's servers, but it lacks the OOB stuff and the full packet headers too.
+						st->clienttype = TCPC_WEBSOCKETNQ;
+
+						//set up where its from...
+						net_from = st->remoteaddr;
+						net_from.connum = con->generic.connum;
+						net_from_connection = &con->generic;
+
+						//inject an accept response - our client is not otherwise expecting to read anything.
+						MSG_BeginWriting(&net_message, net_message.prim, NULL,0);
+						MSG_WriteLong(&net_message, 0);
+						MSG_WriteByte(&net_message, CCREP_ACCEPT);
+						MSG_WriteLong(&net_message, 0);	//port number. don't mess it up.
+						MSG_WriteByte(&net_message, MOD_PROQUAKE);
+						MSG_WriteByte(&net_message, MOD_PROQUAKE_VERSION);
+						MSG_WriteByte(&net_message, 0);	//flags
+						*(int*)net_message.data = BigLong(NETFLAG_CTL|net_message.cursize);
+
+						//and parse it.
+						con->generic.owner->ReadGamePacket();
+					}
+#endif
+					else
+						return "server is using an unsupported protocol";
+
+					goto restart;	//connected, next read will read the actual qizmo data
+				}
+#endif
+				return "unsupported response";
 			}
 		}
 
+		FTE_UNREACHABLE;
 		return NULL;
 #ifdef HAVE_HTTPSV
 	case TCPC_HTTPCLIENT:
@@ -6949,7 +7251,7 @@ restart:	//gotos are evil. I am evil. live with it.
 					else
 					{	//forward it to the other side. much easier with tcp.
 						ftenet_tcp_stream_t *o;
-						short clnum = (st->inbuffer[payoffs+1]<<0)|(st->inbuffer[payoffs+2]<<8);
+						int clnum = (st->inbuffer[payoffs+1]<<0)|(st->inbuffer[payoffs+2]<<8);
 						int type = (st->clienttype != TCPC_WEBRTC_CLIENT)?TCPC_WEBRTC_CLIENT:TCPC_WEBRTC_HOST;
 						for (o = con->tcpstreams; o; o = o->next)
 						{
@@ -6968,14 +7270,32 @@ restart:	//gotos are evil. I am evil. live with it.
 				}
 				else
 #ifdef NQPROT
-					if (st->clienttype == TCPC_WEBSOCKETNQ)
+					if (st->clienttype == TCPC_WEBSOCKETNQ && paylen>=1)
 				{	//hack in an 8-byte header
-					payoffs+=1;
 					paylen-=1;
-					memcpy(net_message_buffer+8, st->inbuffer+payoffs, paylen);
-					net_message.cursize=paylen+8;
-					((int*)net_message_buffer)[0] = BigLong(NETFLAG_UNRELIABLE | net_message.cursize);
-					((int*)net_message_buffer)[1] = LongSwap(++st->fakesequence);
+					switch (st->inbuffer[payoffs++])
+					{	//unreliable...
+					case 0:	//unreliable...
+						memcpy(net_message_buffer+4, st->inbuffer+payoffs, paylen);
+						net_message.cursize=paylen+4;
+						((int*)net_message_buffer)[0] = BigLong(NETFLAG_UNRELIABLE | net_message.cursize);
+						((int*)net_message_buffer)[1] = BigLong(++st->fakesequence);	//webquake is buggy and writes 0s. but this is reliable anyway so fake it all here.
+						break;
+					case 1:	//reliable
+						memcpy(net_message_buffer+4, st->inbuffer+payoffs, paylen);
+						net_message.cursize=paylen+4;
+						((int*)net_message_buffer)[0] = BigLong(NETFLAG_DATA|NETFLAG_EOM | net_message.cursize);
+						//the packet included its own sequence.
+						break;
+					case 2:	//ack - we don't send 'reliables' because websockets are unconditionally reliable anyway, so we won't receive an ack.
+						memcpy(net_message_buffer+4, st->inbuffer+payoffs, paylen);
+						net_message.cursize=paylen+4;
+						((int*)net_message_buffer)[0] = BigLong(NETFLAG_ACK | net_message.cursize);
+						//the packet included its own sequence.
+						break;
+					default:
+						return "TCPC_WEBSOCKETNQ: unknown packet type";
+					}
 				}
 				else
 #endif
@@ -7022,7 +7342,7 @@ restart:	//gotos are evil. I am evil. live with it.
 #ifdef SV_MASTER
 static qboolean FTENET_TCP_GetPacket(ftenet_generic_connection_t *gcon);
 void FTENET_TCP_ICEResponse(ftenet_connections_t *col, int type, const char *cid, const char *sdp)
-{
+{	//Handle a ice_answer/ice_scand response from a brokered udp-only server (forwards the response to the original ws(s) sender).
 	unsigned int id, connum;
 	ftenet_tcp_connection_t *con;
 	ftenet_tcp_stream_t *o;
@@ -7362,11 +7682,33 @@ neterr_t FTENET_TCP_SendPacket(ftenet_generic_connection_t *gcon, int length, co
 				case TCPC_WEBSOCKETNQ:
 					if (length < 8 || ((char*)data)[0] & 0x80)
 						break;
-//					length = 2;
-//					data = "\1\1";
-					length-=7;
-					data=(char*)data + 7;
-					*(char*)data = 1;	//for compat with webquake, we add an extra byte at the start. 1 for reliable, 2 for unreliable.
+					{
+						unsigned int flags = (((const qbyte*)data)[0]<<24)|(((const qbyte*)data)[1]<<16)|(((const qbyte*)data)[2]<<8)|(((const qbyte*)data)[3]<<0);
+						if (flags & NETFLAG_ACK)
+						{
+							length -= 3;
+							data=(const char*)data + 3;
+							*(char*)data = 2;	//for compat with webquake, we add an extra byte at the start. 1 for reliable, 2 for unreliable.
+						}
+						else if (flags & NETFLAG_UNRELIABLE)
+						{	//unreliable, etc...
+							if (length==9)
+								return NETERR_SENT;	//don't bother with the nop.
+							length-=3;
+							data=(const char*)data + 3;
+							*(char*)data = 0;	//for compat with webquake, we add an extra byte at the start. 1 for reliable, 2 for unreliable.
+						}
+						else if (flags & NETFLAG_DATA)
+						{	//reliable
+							if (!(flags & NETFLAG_EOM))
+								return NETERR_DISCONNECTED;	//can't handle fragmentation.
+							length-=3;
+							data=(const char*)data + 3;
+							*(char*)data = 1;	//for compat with webquake, we add an extra byte at the start. 1 for reliable, 2 for unreliable.
+						}
+						else
+							return NETERR_SENT;	//just drop it, without causing errors (eg if they try rconing)
+					}
 					//fallthrough
 				case TCPC_WEBSOCKETU:
 				case TCPC_WEBSOCKETB:
@@ -7377,6 +7719,8 @@ neterr_t FTENET_TCP_SendPacket(ftenet_generic_connection_t *gcon, int length, co
 					}
 					break;
 #endif
+				case TCPC_UNKNOWN:
+					return NETERR_CLOGGED;	//still waiting for the other side to ack out connection.
 				default:
 					break;
 				}
@@ -7698,6 +8042,9 @@ ftenet_generic_connection_t *FTENET_TCP_EstablishConnection(ftenet_connections_t
 
 		if (!isserver)
 		{
+			char hostonly[MAX_QPATH];
+			char *resource;
+
 			newcon->active++;
 			newcon->tcpstreams = Z_Malloc(sizeof(*newcon->tcpstreams));
 			newcon->tcpstreams->next = NULL;
@@ -7707,16 +8054,18 @@ ftenet_generic_connection_t *FTENET_TCP_EstablishConnection(ftenet_connections_t
 
 			newcon->tcpstreams->remoteaddr = adr;
 
-#ifdef HAVE_SSL
-			if (newcon->tls)	//if we're meant to be using tls, wrap the stream in a tls connection
-			{	//remove any markup junk, get just the hostname out of it.
-				char hostonly[MAX_QPATH];
+			{
 				const char *host = strstr(address, "://");
 				const char *port;
 				host = host?host+3:address;
 				port = strchr(host, ':');
+				resource = strchr(host, '/');
+				if (!port)
+					port = resource;
 				if (!port)
 					port = host+strlen(host);
+				if (!resource)
+					resource = "/";
 
 				if (port-host >= sizeof(hostonly))
 				{
@@ -7725,18 +8074,45 @@ ftenet_generic_connection_t *FTENET_TCP_EstablishConnection(ftenet_connections_t
 				}
 				memcpy(hostonly, host, port-host);
 				hostonly[port-host] = 0;
-
+			}
+#ifdef HAVE_SSL
+			if (newcon->tls)	//if we're meant to be using tls, wrap the stream in a tls connection
+			{	//remove any markup junk, get just the hostname out of it.
 				newcon->tcpstreams->clientstream = FS_OpenSSL(hostonly, newcon->tcpstreams->clientstream, false);
 				if (!newcon->tcpstreams->clientstream)
 					return NULL;
 			}
 #endif
 
-			//send the qizmo greeting. any actual data is just <ushort len><byte data[len]> otherwise consistent with qw/udp, including challenges.
-			newcon->tcpstreams->clienttype = TCPC_UNKNOWN;
-			memcpy(newcon->tcpstreams->outbuffer, "qizmo\n", newcon->tcpstreams->outlen = 6);
+#ifdef HAVE_HTTPSV
+			if (adr.prot == NP_WS || adr.prot == NP_WSS)
+			{
+				const char *s;
+				char key[16];
+				char b64key[(16*4)/3+3];
+				Sys_RandomBytes(key, sizeof(key));
+				Base64_EncodeBlock(key, sizeof(key), b64key, sizeof(b64key));
+				s = va("GET %s HTTP/1.1\r\n"
+						"Host: %s\r\n"
+						"Connection: Upgrade\r\n"
+						"Upgrade: websocket\r\n"
+						"Sec-WebSocket-Key: %s\r\n"
+						"Sec-WebSocket-Version: 13\r\n"
+						"Sec-WebSocket-Protocol: quake,fteqw\r\n"	//fteqw for proper protocols, falling back to webquake's alternative which breaks OOB/handshakes/etc (which is also buggy enough to require it to be the first protocol passed).
+						"\r\n", resource, hostonly, b64key);
+				newcon->tcpstreams->clienttype = TCPC_UNKNOWN;
+				memcpy(newcon->tcpstreams->outbuffer, s, newcon->tcpstreams->outlen = strlen(s));
+			}
+			else
+#endif
+			//if (adr.prot == NP_STREAM || adr.prot == NP_TLS)
+			{	//send the qizmo greeting. any actual data is just <ushort len><byte data[len]> otherwise consistent with qw/udp, including challenges.
+				newcon->tcpstreams->clienttype = TCPC_UNKNOWN;
+				memcpy(newcon->tcpstreams->outbuffer, "qizmo\n", newcon->tcpstreams->outlen = 6);
+			}
 
 			newcon->tcpstreams->timeouttime = Sys_DoubleTime() + 30;
+			FTENET_TCP_Flush(newcon, newcon->tcpstreams);	//try and send it now, if we can.
 		}
 		else
 		{
@@ -8340,8 +8716,6 @@ struct ftenet_generic_connection_s *FTENET_IRCConnect_EstablishConnection(qboole
 cvar_t  net_ice_servers = CVAR("net_ice_servers", "");
 cvar_t  net_ice_relayonly = CVAR("net_ice_relayonly", "0");
 
-#include "web/ftejslib.h"
-
 typedef struct
 {
 	ftenet_generic_connection_t generic;
@@ -8396,7 +8770,10 @@ static neterr_t FTENET_WebSocket_SendPacket(ftenet_generic_connection_t *gcon, i
 		return NETERR_DISCONNECTED;
 	if (NET_CompareAdr(to, &wsc->remoteadr))
 	{
-		if (emscriptenfte_ws_send(wsc->datasock, data, length) < 0)
+		int r = emscriptenfte_ws_send(wsc->datasock, data, length);
+		if (r < 0)
+			return NETERR_DISCONNECTED;
+		if (r == 0 && length)
 			return NETERR_CLOGGED;
 		return NETERR_SENT;
 	}
@@ -8432,7 +8809,7 @@ static void FTENET_WebRTC_Heartbeat(ftenet_websocket_connection_t *b)
 		Info_SetValueForKey(info+3, "mapname", InfoBuf_ValueForKey(&svs.info, "map"), sizeof(info)-3);
 		Info_SetValueForKey(info+3, "needpass", InfoBuf_ValueForKey(&svs.info, "needpass"), sizeof(info)-3);
 
-		if (emscriptenfte_ws_send(b->brokersock, info, 3+strlen(info+3)) < 0)
+		if (emscriptenfte_ws_send(b->brokersock, info, 3+strlen(info+3)) <= 0)
 			return;
 	}
 #endif
@@ -8455,6 +8832,7 @@ static void FTENET_WebRTC_Callback(void *ctxp, int ctxi, int/*enum icemsgtype_s*
 }
 static int FTENET_WebRTC_Create(qboolean initiator, ftenet_websocket_connection_t *wsc, int clid)
 {
+	int fd;
 	char config[4096], tmp[256];
 	qboolean first = true;
 	const char *servers;
@@ -8483,7 +8861,7 @@ static int FTENET_WebRTC_Create(qboolean initiator, ftenet_websocket_connection_
 				break;
 			}
 		}
-		if (*brokeraddress == '/')
+		if (*brokeraddress == '/' || !*brokeraddress)
 		{
 			brokeraddress = net_ice_broker.string;
 			for (i = countof(pre); i --> 0; )
@@ -8498,9 +8876,9 @@ static int FTENET_WebRTC_Create(qboolean initiator, ftenet_websocket_connection_
 		Q_strncpyz(com_token, brokeraddress, sizeof(com_token));
 		c = strchr(com_token, '/');
 		if (c) *c = 0;
-
 		first = false;
-		Q_strncatz(config, va("\n{\"urls\":[\"stun:%s\"]}", COM_QuotedString(com_token, tmp,sizeof(tmp), true)), sizeof(config));
+		if (*com_token)
+			Q_strncatz(config, va("{\"urls\":[\"stun:%s\"]}", COM_QuotedString(com_token, tmp,sizeof(tmp), true)), sizeof(config));
 	}
 
 	for(servers = net_ice_servers.string; (servers=COM_Parse(servers)); )
@@ -8550,7 +8928,10 @@ static int FTENET_WebRTC_Create(qboolean initiator, ftenet_websocket_connection_
 		",\"iceTransportPolicy\":\"%s\""
 		"}",net_ice_relayonly.ival?"relay":"all"),	sizeof(config));
 
-	return emscriptenfte_rtc_create(initiator, wsc, clid, FTENET_WebRTC_Callback, config);
+	fd = emscriptenfte_rtc_create(initiator, wsc, clid, FTENET_WebRTC_Callback, config);
+	if (fd < 0)
+		Con_Printf("emscriptenfte_rtc_create failed: %s\n", config);
+	return fd;
 }
 
 static qboolean FTENET_WebRTC_GetPacket(ftenet_generic_connection_t *gcon)
@@ -8606,10 +8987,11 @@ static qboolean FTENET_WebRTC_GetPacket(ftenet_generic_connection_t *gcon)
 		switch(cmd)
 		{
 		case ICEMSG_PEERLOST:	//connection closing...
+			s = MSG_ReadString();	//reason
 			if (cl == -1)
 			{
 				wsc->failed = true;
-				Con_Printf("Broker closing connection: %s\n", MSG_ReadString());
+				Con_Printf("Broker closing connection: %s\n", s);
 			}
 			else if (cl >= 0 && cl < wsc->numclients)
 			{
@@ -8617,11 +8999,11 @@ static qboolean FTENET_WebRTC_GetPacket(ftenet_generic_connection_t *gcon)
 				if (wsc->clients[cl].datasock != INVALID_SOCKET)
 					emscriptenfte_ws_close(wsc->clients[cl].datasock);
 				wsc->clients[cl].datasock = INVALID_SOCKET;
-//				Con_Printf("Broker closing connection: %s\n", MSG_ReadString());
+//				Con_Printf("Broker closing connection: %s\n", s);
 			}
 			break;
 		case ICEMSG_GREETING:	//reports the trailing url we're 'listening' on. anyone else using that url will connect to us.
-			s = MSG_ReadString();
+			s = MSG_ReadString();	//the id we're visible as
 			if (*s == '/')
 				s++;
 			p = wsc->remoteadr.address.websocketurl;
@@ -8675,7 +9057,7 @@ static qboolean FTENET_WebRTC_GetPacket(ftenet_generic_connection_t *gcon)
 			}
 			break;
 		case ICEMSG_OFFER:	//we received an offer from a client
-			s = MSG_ReadString();
+			s = MSG_ReadString();	//either json or raw sdp
 			if (wsc->generic.islisten)
 			{
 				if (cl < wsc->numclients && wsc->clients[cl].datasock != INVALID_SOCKET)
@@ -8688,7 +9070,7 @@ static qboolean FTENET_WebRTC_GetPacket(ftenet_generic_connection_t *gcon)
 			}
 			break;
 		case ICEMSG_CANDIDATE:
-			s = MSG_ReadString();
+			s = MSG_ReadString();	//either json or raw sdp
 			if (wsc->generic.islisten)
 			{
 				if (cl < wsc->numclients && wsc->clients[cl].datasock != INVALID_SOCKET)
@@ -8752,6 +9134,7 @@ static int FTENET_WebRTC_GetAddresses(struct ftenet_generic_connection_s *con, u
 	{
 		*addresses = wsc->remoteadr;
 		*adrflags = 0;
+		*adrparams = NULL;
 		return 1;
 	}
 	return 0;
@@ -8900,7 +9283,7 @@ static ftenet_generic_connection_t *FTENET_WebRTC_EstablishConnection(ftenet_con
 	if (adr.type == NA_INVALID)
 	{	//if its using our broker, flip it over to a real address type, if we can.
 		adr.type = NA_WEBSOCKET;
-		Q_strncpyz(adr.address.websocketurl, net_ice_broker.string, sizeof(adr.address.websocketurl));
+		Q_strncpyz(adr.address.websocketurl, address, sizeof(adr.address.websocketurl));
 	}
 
 	brokersocket = FTENET_WebRTC_Establish(address, isserver?"rtc_host":"rtc_client");
@@ -9042,6 +9425,10 @@ void NET_ReadPackets (ftenet_connections_t *collection)
 						continue;
 				}
 
+				if (net_fakemtu.ival)
+					if (net_message.cursize > abs(net_fakemtu.ival))
+						continue;
+
 				collection->bytesin += net_message.cursize;
 				collection->packetsin += 1;
 				net_from.connum = c+1;
@@ -9436,7 +9823,7 @@ void NET_PrintAddresses(ftenet_connections_t *collection)
 		fp = InfoBuf_ValueForKey(&svs.info, "*fp");
 		if (*fp)
 			fp = va(S_COLOR_GRAY"?fp=%s", fp);
-		if (*COM_Parse(fs_manifest->schemes))
+		if (fs_manifest->schemes && *COM_Parse(fs_manifest->schemes))
 			scheme = va(S_COLOR_GRAY"%s://", com_token);
 	}
 #endif
@@ -10071,8 +10458,12 @@ void NET_Init (void)
 	Cvar_Register(&timeout, "networking");
 	Cvar_Register(&net_hybriddualstack, "networking");
 	Cvar_Register(&net_fakeloss, "networking");
+	Cvar_Register(&net_fakemtu, "networking");
 
 #if defined(HAVE_SSL)
+#ifdef _DEBUG
+	Cmd_AddCommand("tls_provider_test", TLS_Provider_Test_f);
+#endif
 	Cvar_Register(&tls_provider, "networking");
 	Cvar_Register(&tls_ignorecertificateerrors, "networking");
 #endif
@@ -10094,6 +10485,7 @@ void NET_Init (void)
 #endif
 #ifdef HAVE_DTLS
 	Cvar_Register(&net_enable_dtls, "networking");
+	Cvar_ForceCallback(&net_enable_dtls);
 #endif
 #if defined(HAVE_SERVER) && defined(KEXLOBBY)
 	Cvar_Register(&net_enable_kexlobby, "networking");
@@ -10208,7 +10600,7 @@ static void QDECL SV_Tcpport_Callback(struct cvar_s *var, char *oldvalue)
 	else
 		FTENET_AddToCollection(svs.sockets, var->name, var->string, NA_IP, NP_STREAM);
 }
-cvar_t	sv_port_tcp = CVARFC("sv_port_tcp", "", CVAR_SERVERINFO, SV_Tcpport_Callback);
+cvar_t	sv_port_tcp = CVARFCD("sv_port_tcp", "", CVAR_SERVERINFO, SV_Tcpport_Callback, "Port number to list on for inbound tcp-based connections (including tls variants). Can be a list for multiple ports. If ips are included then binds to that specific interface. Whether any specific protocol is accepted depends upon other settings.");
 #ifdef HAVE_LEGACY
 cvar_t	qtv_streamport	= CVARAFCD(	"qtv_streamport", "",
 									"mvd_streamport", 0, SV_Tcpport_Callback, "Legacy cvar. Use sv_port_tcp instead.");
@@ -10219,14 +10611,14 @@ static void QDECL SV_Tcpport6_Callback(struct cvar_s *var, char *oldvalue)
 {
 	FTENET_AddToCollection(svs.sockets, var->name, var->string, NA_IPV6, NP_STREAM);
 }
-cvar_t	sv_port_tcp6 = CVARC("sv_port_tcp6", "", SV_Tcpport6_Callback);
+cvar_t	sv_port_tcp6 = CVARCD("sv_port_tcp6", "", SV_Tcpport6_Callback, "Equivelent to sv_port_tcp, but port numbers are assumed to be ipv6 only. relevant only when not using hybrid sockets.");
 #endif
 #ifdef HAVE_IPV4
 static void QDECL SV_Port_Callback(struct cvar_s *var, char *oldvalue)
 {
 	FTENET_AddToCollection(svs.sockets, var->name, var->string, NA_IP, NP_DGRAM);
 }
-cvar_t  sv_port_ipv4 = CVARC("sv_port", STRINGIFY(PORT_DEFAULTSERVER), SV_Port_Callback);
+cvar_t  sv_port_ipv4 = CVARCD("sv_port", STRINGIFY(PORT_DEFAULTSERVER), SV_Port_Callback, "Port number to list on for inbound udp-based connections (including dtls variants). Can be a list for multiple ports. If ips are included then binds to that specific interface. Whether any specific protocol is accepted depends upon other settings.");
 #endif
 #ifdef HAVE_IPV6
 static void QDECL SV_PortIPv6_Callback(struct cvar_s *var, char *oldvalue)
@@ -10240,7 +10632,7 @@ void QDECL SV_PortIPX_Callback(struct cvar_s *var, char *oldvalue)
 {
 	FTENET_AddToCollection(svs.sockets, var->name, var->string, NA_IPX, NP_DGRAM);
 }
-cvar_t  sv_port_ipx = CVARC("sv_port_ipx", "", SV_PortIPX_Callback);
+cvar_t  sv_port_ipx = CVARCD("sv_port_ipx", "", SV_PortIPX_Callback, "If you need this cvar then you're doing something weird/ancient.");
 #endif
 #ifdef UNIXSOCKETS
 void QDECL SV_PortUNIX_Callback(struct cvar_s *var, char *oldvalue)
@@ -10250,7 +10642,7 @@ void QDECL SV_PortUNIX_Callback(struct cvar_s *var, char *oldvalue)
 #ifdef __linux	//linux adds abstract sockets, which require no filesystem cleanup.
 cvar_t  sv_port_unix = CVARC("sv_port_unix", "@qsock.fte", SV_PortUNIX_Callback);
 #else
-cvar_t  sv_port_unix = CVARC("sv_port_unix", "/tmp/qsock.fte", SV_PortUNIX_Callback);
+cvar_t  sv_port_unix = CVARC("sv_port_unix", "/tmp/qsock.fte", SV_PortUNIX_Callback);	//should probably use $XDG_RUNTIME_DIR
 #endif
 #endif
 #ifdef HAVE_NATPMP
@@ -10271,7 +10663,18 @@ void QDECL SV_PortRTC_Callback(struct cvar_s *var, char *oldvalue)
 {
 	FTENET_AddToCollection(svs.sockets, var->name, var->string, NA_WEBSOCKET, NP_DTLS);
 }
-cvar_t  sv_port_rtc = CVARCD("sv_port_rtc", "/", SV_PortRTC_Callback, "This specifies the broker url to use to obtain clients from. If the hostname is ommitted, it'll come from the manifest. If omitted, the broker service will randomize the resource part, so be sure to tell your friends the path reported by eg status rather than just this cvar value. Or just set it to 'rtc:///example' and tell clients to connect to the same sservevalue.");
+static cvar_t  sv_port_rtc = CVARCD("sv_port_rtc", "/", SV_PortRTC_Callback, "This specifies the broker url to use to obtain clients from. If the hostname is ommitted, it'll come from the manifest. If omitted, the broker service will randomize the resource part, so be sure to tell your friends the path reported by eg status rather than just this cvar value. Or just set it to 'rtc:///example' and tell clients to connect to the same sservevalue.");
+#elif defined(SUPPORT_ICE)
+void QDECL SV_PortRTC_Callback(struct cvar_s *var, char *oldvalue)
+{
+	const char *s = var->string;
+	if (*s == '/')
+		;
+	else if (*var->string)
+		s = va("/%s", var->string);
+	FTENET_AddToCollection(svs.sockets, var->name, s, NA_INVALID, NP_RTC_TLS);
+}
+static cvar_t  sv_port_rtc = CVARCD("sv_port_rtc", "", SV_PortRTC_Callback, "This specifies the broker url to use to obtain clients from. If the hostname is ommitted, it'll come from the manifest. If omitted, the broker service will randomize the resource part, so be sure to tell your friends the path reported by eg status rather than just this cvar value. Or just set it to 'rtc:///example' and tell clients to connect to the same sservevalue.");
 #endif
 
 void SVNET_RegisterCvars(void)
@@ -10281,6 +10684,8 @@ void SVNET_RegisterCvars(void)
 	Cvar_Register (&net_ice_servers,	"networking");
 	Cvar_Register (&sv_port_rtc,	"networking");
 //	sv_port_rtc.restriction = RESTRICT_MAX;
+#elif defined(SUPPORT_ICE)
+	Cvar_Register (&sv_port_rtc,	"networking");
 #endif
 #if defined(TCPCONNECT) && defined(HAVE_IPV4)
 	Cvar_Register (&sv_port_tcp,	"networking");
@@ -10350,7 +10755,8 @@ void NET_InitServer(void)
 #endif
 		}
 
-#ifdef FTE_TARGET_WEB
+#if defined(SUPPORT_ICE) || defined(FTE_TARGET_WEB)
+		Cvar_ForceCallback(&sv_public);
 		Cvar_ForceCallback(&sv_port_rtc);
 #endif
 #ifdef HAVE_IPV4
@@ -10379,9 +10785,6 @@ void NET_InitServer(void)
 #endif
 #ifdef HAVE_DTLS
 		Cvar_ForceCallback(&net_enable_dtls);
-#endif
-#if defined(SUPPORT_ICE) || defined(FTE_TARGET_WEB)
-		Cvar_ForceCallback(&sv_public);
 #endif
 	}
 	else
diff --git a/engine/common/netinc.h b/engine/common/netinc.h
index 039a8f54f..4fc6bc4ea 100644
--- a/engine/common/netinc.h
+++ b/engine/common/netinc.h
@@ -394,7 +394,7 @@ typedef struct ftecrypto_s
 	const struct dtlsfuncs_s *(*DTLS_InitServer)(void);	//returns NULL if there's no cert available.
 
 	//digital signature stuff. note: uses sha2_512
-	enum hashvalidation_e (*VerifyHash)(const qbyte *hashdata, size_t hashsize, const qbyte *certdata, size_t certsize, const qbyte *signdata, size_t signsize);
+	enum hashvalidation_e (*VerifyHash)(const qbyte *hashdata, size_t hashsize, const qbyte *certdata, size_t certsize, const qbyte *signdata, size_t signsize); //expect the cert in PEM format.
 	int (*GenerateSignature)(const qbyte *hashdata, size_t hashsize, qbyte *signdata, size_t signsizemax);
 } ftecrypto_t;
 #define cryptolib_count 6
@@ -448,8 +448,8 @@ enum icemsgtype_s
 	ICEMSG_PEERLOST=0,	//other side dropped connection
 	ICEMSG_GREETING=1,	//master telling us our unique game name
 	ICEMSG_NEWPEER=2,	//relay established, send an offer now.
-	ICEMSG_OFFER=3,		//peer's initial details
-	ICEMSG_CANDIDATE=4,	//candidate updates. may arrive late as new ones are discovered.
+	ICEMSG_OFFER=3,		//peer->peer - peer's offer or answer details
+	ICEMSG_CANDIDATE=4,	//peer->peer - candidate updates. may arrive late as new ones are discovered.
 	ICEMSG_ACCEPT=5,	//go go go (response from offer)
 	ICEMSG_SERVERINFO=6,//server->broker (for advertising the server properly)
 	ICEMSG_SERVERUPDATE=7,//broker->browser (for querying available server lists)
diff --git a/engine/common/plugin.c b/engine/common/plugin.c
index 2cc943bea..4ab83438b 100644
--- a/engine/common/plugin.c
+++ b/engine/common/plugin.c
@@ -16,7 +16,6 @@ struct q3gamecode_s *q3;
 static struct plugin_s *q3plug;
 #endif
 
-#define Q_snprintf Q_snprintfz
 #define Q_strlcpy Q_strncpyz
 #define Q_strlcat Q_strncatz
 #define Sys_Errorf Sys_Error
@@ -28,12 +27,18 @@ static struct plugin_s *q3plug;
 	#include "../engine/common/com_phys_ode.c"
 #endif
 
+#ifdef STATIC_EZHUD	//if its statically linked and loading by default then block it by default and let configs reenable it. The defaults must be maintained for deltaing configs to work, yet they're defective and should never be used in that default configuration
+cvar_t plug_sbar = CVARD("plug_sbar", "0", "Controls whether plugins are allowed to draw the hud, rather than the engine (when allowed by csqc). This is typically used to permit the ezhud plugin without needing to bother unloading it.\n=0: never use hud plugins.\n&1: Use hud plugins in deathmatch.\n&2: Use hud plugins in singleplayer/coop.\n=3: Always use hud plugins (when loaded).");
+#else
 cvar_t plug_sbar = CVARD("plug_sbar", "3", "Controls whether plugins are allowed to draw the hud, rather than the engine (when allowed by csqc). This is typically used to permit the ezhud plugin without needing to bother unloading it.\n=0: never use hud plugins.\n&1: Use hud plugins in deathmatch.\n&2: Use hud plugins in singleplayer/coop.\n=3: Always use hud plugins (when loaded).");
+#endif
 cvar_t plug_loaddefault = CVARD("plug_loaddefault", "1", "0: Load plugins only via explicit plug_load commands\n1: Load built-in plugins and those selected via the package manager\n2: Scan for misc plugins, loading all that can be found, but not built-ins.\n3: Scan for plugins, and then load any built-ins");
 
 extern qboolean Plug_Q3_Init(void);
 extern qboolean Plug_Bullet_Init(void);
 extern qboolean Plug_ODE_Init(void);
+extern qboolean Plug_EZHud_Init(void);
+extern qboolean Plug_OpenSSL_Init(void);
 static struct
 {
 	const char *name;
@@ -50,6 +55,12 @@ static struct
 	{"GLTF", Plug_GLTF_Init},
 #endif
 
+#ifdef STATIC_OPENSSL
+	{"openssl_internal", Plug_OpenSSL_Init},
+#endif
+#ifdef STATIC_EZHUD
+	{"EZHud_internal", Plug_EZHud_Init},
+#endif
 #ifdef STATIC_Q3
 	{"quake3", Plug_Q3_Init},
 #endif
@@ -229,14 +240,14 @@ static plugin_t *Plug_Load(const char *file)
 		{	//already postfixed, don't mess with the name given
 			//mandate the fteplug_ prefix (don't let them load random dlls)
 			if (!Q_strncasecmp(file, PLUGINPREFIX, strlen(PLUGINPREFIX)))
-				if (FS_NativePath(file, prefixes[i], newplug->filename, sizeof(newplug->filename)))
+				if (FS_SystemPath(file, prefixes[i], newplug->filename, sizeof(newplug->filename)))
 					newplug->lib = Sys_LoadLibrary(newplug->filename, funcs);
 		}
 		else
 		{	//otherwise scan for it
 			for (j = 0; j < countof(postfixes) && !newplug->lib; j++)
 			{
-				if (FS_NativePath(va(PLUGINPREFIX"%s%s", file, postfixes[j]), prefixes[i], newplug->filename, sizeof(newplug->filename)))
+				if (FS_SystemPath(va(PLUGINPREFIX"%s%s", file, postfixes[j]), prefixes[i], newplug->filename, sizeof(newplug->filename)))
 					newplug->lib = Sys_LoadLibrary(newplug->filename, funcs);
 			}
 		}
@@ -1068,7 +1079,9 @@ void Plug_Net_Close_Internal(qhandle_t handle)
 
 static int QDECL Plug_Net_Recv(qhandle_t handle, void *dest, int destlen)
 {
+#ifdef HAVE_PACKET
 	int read;
+#endif
 
 	if (handle < 0 || handle >= pluginstreamarraylen || pluginstreamarray[handle].plugin != currentplug)
 		return -2;
@@ -1098,7 +1111,9 @@ static int QDECL Plug_Net_Recv(qhandle_t handle, void *dest, int destlen)
 }
 static int QDECL Plug_Net_Send(qhandle_t handle, void *src, int srclen)
 {
+#ifdef HAVE_PACKET
 	int written;
+#endif
 	if (handle < 0 || handle >= pluginstreamarraylen || pluginstreamarray[handle].plugin != currentplug)
 		return -2;
 	switch(pluginstreamarray[handle].type)
@@ -1125,6 +1140,7 @@ static int QDECL Plug_Net_Send(qhandle_t handle, void *src, int srclen)
 		return -2;
 	}
 }
+#ifdef HAVE_PACKET
 static int QDECL Plug_Net_SendTo(qhandle_t handle, void *src, int srclen, netadr_t *address)
 {
 	int written;
@@ -1146,7 +1162,6 @@ static int QDECL Plug_Net_SendTo(qhandle_t handle, void *src, int srclen, netadr
 		return -2;
 	switch(pluginstreamarray[handle].type)
 	{
-#ifdef HAVE_PACKET
 	case STREAM_SOCKET:
 		written = sendto(pluginstreamarray[handle].socket, src, srclen, 0, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
 		if (written < 0)
@@ -1159,11 +1174,11 @@ static int QDECL Plug_Net_SendTo(qhandle_t handle, void *src, int srclen, netadr
 		else if (written == 0)
 			return -2;	//closed by remote connection.
 		return written;
-#endif
 	default:
 		return -2;
 	}
 }
+#endif
 static void QDECL Plug_Net_Close(qhandle_t handle)
 {
 	if (handle < 0 || handle >= pluginstreamarraylen || pluginstreamarray[handle].plugin != currentplug)
@@ -1187,7 +1202,7 @@ void QDECL Plug_FS_EnumerateFiles(enum fs_relative fsroot, const char *match, in
 		}
 		else
 		{
-			FS_NativePath("", fsroot, base, sizeof(base));
+			FS_SystemPath("", fsroot, base, sizeof(base));
 			Sys_EnumerateFiles(base, match, callback, ctx, NULL);
 		}
 	}
@@ -1235,7 +1250,7 @@ static void Plug_Load_f(void)
 
 void Plug_Initialise(qboolean fromgamedir)
 {
-	char nat[MAX_OSPATH];
+	char sys[MAX_OSPATH], disp[MAX_OSPATH];
 
 	if (!plugfuncs)
 	{
@@ -1260,15 +1275,15 @@ void Plug_Initialise(qboolean fromgamedir)
 	{
 		if (!fromgamedir)
 		{
-			if (FS_NativePath("", FS_BINARYPATH, nat, sizeof(nat)))
+			if (FS_DisplayPath("", FS_BINARYPATH, disp, sizeof(disp)) && FS_SystemPath("", FS_BINARYPATH, sys, sizeof(sys)))
 			{
-				Con_DPrintf("Loading plugins from \"%s\"\n", nat);
-				Sys_EnumerateFiles(nat, PLUGINPREFIX"*" ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, Plug_EnumeratedRoot, NULL, NULL);
+				Con_DPrintf("Loading plugins from \"%s\"\n", disp);
+				Sys_EnumerateFiles(sys, PLUGINPREFIX"*" ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, Plug_EnumeratedRoot, NULL, NULL);
 			}
-			if (FS_NativePath("", FS_LIBRARYPATH, nat, sizeof(nat)))
+			if (FS_DisplayPath("", FS_LIBRARYPATH, disp, sizeof(disp)) && FS_SystemPath("", FS_BINARYPATH, sys, sizeof(sys)))
 			{
-				Con_DPrintf("Loading plugins from \"%s\"\n", nat);
-				Sys_EnumerateFiles(nat, PLUGINPREFIX"*" ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, Plug_EnumeratedRoot, NULL, NULL);
+				Con_DPrintf("Loading plugins from \"%s\"\n", disp);
+				Sys_EnumerateFiles(sys, PLUGINPREFIX"*" ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, Plug_EnumeratedRoot, NULL, NULL);
 			}
 		}
 	}
@@ -1664,7 +1679,7 @@ void Plug_Close_f(void)
 
 	for (plug = plugs; plug; plug = plug->next)
 	{
-		if (!strcmp(plug->name, name))
+		if (!Q_strcasecmp(plug->name, name))
 		{
 			Plug_Close(plug);
 			return;
@@ -1674,7 +1689,7 @@ void Plug_Close_f(void)
 	name = va("plugins/%s", name);
 	for (plug = plugs; plug; plug = plug->next)
 	{
-		if (!strcmp(plug->name, name))
+		if (!Q_strcasecmp(plug->name, name))
 		{
 			Plug_Close(plug);
 			return;
@@ -1760,6 +1775,7 @@ int QDECL Plug_List_Print(const char *fname, qofs_t fsize, time_t modtime, void
 
 void Plug_List_f(void)
 {
+	char displaypath[MAX_OSPATH];
 	char binarypath[MAX_OSPATH];
 	char librarypath[MAX_OSPATH];
 	char rootpath[MAX_OSPATH];
@@ -1768,7 +1784,10 @@ void Plug_List_f(void)
 
 	Con_Printf("Loaded plugins:\n");
 	for (plug = plugs; plug; plug = plug->next)
-		Con_Printf("^[^2%s\\type\\plug_close %s\\^]: loaded\n", plug->filename, plug->name);
+		if (plug->lib && FS_DisplayPath(plug->filename, FS_SYSTEM, displaypath, sizeof(displaypath)))
+			Con_Printf("^[^2%s\\type\\plug_close %s\\^]: loaded\n", displaypath, plug->name);
+		else
+			Con_Printf("^[^2%s\\type\\plug_close %s\\^]: loaded\n", plug->filename, plug->name);
 
 	if (staticplugins[0].name)
 	{
@@ -1777,17 +1796,18 @@ void Plug_List_f(void)
 			Plug_List_Print(staticplugins[u].name, 0, 0, NULL, NULL);
 	}
 
-	if (FS_NativePath("", FS_BINARYPATH, binarypath, sizeof(binarypath)))
+	if (FS_SystemPath("", FS_BINARYPATH, binarypath, sizeof(binarypath)))
 	{
 #ifdef _WIN32
 		char *mssuck;
 		while ((mssuck=strchr(binarypath, '\\')))
 			*mssuck = '/';
 #endif
-		Con_Printf("Scanning for plugins at %s:\n", binarypath);
-		Sys_EnumerateFiles(binarypath, PLUGINPREFIX"*" ARCH_DL_POSTFIX, Plug_List_Print, binarypath, NULL);
+		if (FS_DisplayPath(binarypath, FS_SYSTEM, displaypath, sizeof(displaypath)))
+			Con_Printf("Scanning for plugins at %s:\n", displaypath);
+		Sys_EnumerateFiles(binarypath, PLUGINPREFIX"*" ARCH_DL_POSTFIX, Plug_List_Print, displaypath, NULL);
 	}
-	if (FS_NativePath("", FS_LIBRARYPATH, librarypath, sizeof(librarypath)))
+	if (FS_SystemPath("", FS_LIBRARYPATH, librarypath, sizeof(librarypath)))
 	{
 #ifdef _WIN32
 		char *mssuck;
@@ -1796,11 +1816,12 @@ void Plug_List_f(void)
 #endif
 		if (strcmp(librarypath, rootpath))
 		{
-			Con_Printf("Scanning for plugins at %s:\n", librarypath);
-			Sys_EnumerateFiles(librarypath, PLUGINPREFIX"*" ARCH_DL_POSTFIX, Plug_List_Print, librarypath, NULL);
+			if (FS_DisplayPath(librarypath, FS_SYSTEM, displaypath, sizeof(displaypath)))
+				Con_Printf("Scanning for plugins at %s:\n", displaypath);
+			Sys_EnumerateFiles(librarypath, PLUGINPREFIX"*" ARCH_DL_POSTFIX, Plug_List_Print, displaypath, NULL);
 		}
 	}
-	if (FS_NativePath("", FS_ROOT, rootpath, sizeof(rootpath)))
+	if (FS_SystemPath("", FS_ROOT, rootpath, sizeof(rootpath)))
 	{
 #ifdef _WIN32
 		char *mssuck;
@@ -1809,8 +1830,9 @@ void Plug_List_f(void)
 #endif
 		if (strcmp(binarypath, rootpath))
 		{
-			Con_DPrintf("Scanning for plugins at %s:\n", rootpath);
-			Sys_EnumerateFiles(rootpath, PLUGINPREFIX"*" ARCH_DL_POSTFIX, Plug_List_Print, rootpath, NULL);
+			if (FS_DisplayPath(rootpath, FS_SYSTEM, displaypath, sizeof(displaypath)))
+				Con_Printf("Scanning for plugins at %s:\n", displaypath);
+			Sys_EnumerateFiles(rootpath, PLUGINPREFIX"*" ARCH_DL_POSTFIX, Plug_List_Print, displaypath, NULL);
 		}
 	}
 
@@ -1948,7 +1970,7 @@ static void *QDECL PlugBI_GetEngineInterface(const char *interfacename, size_t s
 
 			FS_FLocateFile,
 			FS_OpenVFS,
-			FS_NativePath,
+			FS_SystemPath,
 
 			FS_Rename,
 			FS_Remove,
@@ -2009,6 +2031,7 @@ static void *QDECL PlugBI_GetEngineInterface(const char *interfacename, size_t s
 		if (structsize == sizeof(funcs))
 			return &funcs;
 	}
+#ifdef HAVE_PACKET
 	if (!strcmp(interfacename, plugnetfuncs_name))
 	{
 		static plugnetfuncs_t funcs =
@@ -2038,6 +2061,7 @@ static void *QDECL PlugBI_GetEngineInterface(const char *interfacename, size_t s
 		if (structsize == sizeof(funcs))
 			return &funcs;
 	}
+#endif
 	if (!strcmp(interfacename, plugworldfuncs_name))
 	{
 		static plugworldfuncs_t funcs =
@@ -2265,6 +2289,7 @@ static void *QDECL PlugBI_GetEngineInterface(const char *interfacename, size_t s
 			return &funcs;
 	}
 
+#ifdef CL_MASTER
 	if (!strcmp(interfacename, plugmasterfuncs_name))
 	{
 		static plugmasterfuncs_t funcs =
@@ -2285,6 +2310,7 @@ static void *QDECL PlugBI_GetEngineInterface(const char *interfacename, size_t s
 		if (structsize == sizeof(funcs))
 			return &funcs;
 	}
+#endif
 	if (!strcmp(interfacename, plugimagefuncs_name))
 	{
 		static plugimagefuncs_t funcs =
@@ -2374,6 +2400,7 @@ static void *QDECL PlugBI_GetEngineInterface(const char *interfacename, size_t s
 			VectorAngles,
 			AngleVectors,
 			GenMatrixPosQuat4Scale,
+			QuaternionSlerp,
 
 			Alias_ForceConvertBoneData,
 
diff --git a/engine/common/pr_bgcmd.c b/engine/common/pr_bgcmd.c
index 3649d63bd..3c58cd74c 100644
--- a/engine/common/pr_bgcmd.c
+++ b/engine/common/pr_bgcmd.c
@@ -1019,8 +1019,8 @@ void QCBUILTIN PF_getsurfacenormal(pubprogfuncs_t *prinst, struct globalvars_s *
 
 	model = w->Get_CModel(w, ent->v->modelindex);
 
-	if (!model || model->type != mod_brush || surfnum >= model->nummodelsurfaces)
-	{
+	if (!model || model->type != mod_brush || surfnum >= model->nummodelsurfaces || !model->surfaces[model->firstmodelsurface+surfnum].plane)
+	{	//non-planar surfs don't always have a single plane... return nothing instead of breaking.
 		G_FLOAT(OFS_RETURN+0) = 0;
 		G_FLOAT(OFS_RETURN+1) = 0;
 		G_FLOAT(OFS_RETURN+2) = 0;
@@ -1053,11 +1053,23 @@ void QCBUILTIN PF_getsurfacetexture(pubprogfuncs_t *prinst, struct globalvars_s
 	if (!model || model->type != mod_brush)
 		return;
 
-	if (surfnum < 0 || surfnum >= model->nummodelsurfaces)
+	if (surfnum >= model->nummodelsurfaces)
 		return;
-	surfnum += model->firstmodelsurface;
-	surf = &model->surfaces[surfnum];
-	G_INT(OFS_RETURN) = PR_TempString(prinst, surf->texinfo->texture->name);
+	if (surfnum < 0)
+	{
+		surfnum = -1-surfnum;
+		if ((unsigned)surfnum >= (unsigned)model->numtextures)
+			return;	//nope, outta range.
+		if (!model->textures[surfnum])
+			return;	//some maps are just broken.
+		G_INT(OFS_RETURN) = PR_TempString(prinst, model->textures[surfnum]->name);
+	}
+	else
+	{
+		surfnum += model->firstmodelsurface;
+		surf = &model->surfaces[surfnum];
+		G_INT(OFS_RETURN) = PR_TempString(prinst, surf->texinfo->texture->name);
+	}
 }
 #define TriangleNormal(a,b,c,n) ( \
 	(n)[0] = ((a)[1] - (b)[1]) * ((c)[2] - (b)[2]) - ((a)[2] - (b)[2]) * ((c)[1] - (b)[1]), \
@@ -2040,6 +2052,28 @@ void QCBUILTIN PF_memfree (pubprogfuncs_t *prinst, struct globalvars_s *pr_globa
 	if (qcptr)
 		prinst->AddressableFree(prinst, cptr);
 }
+void QCBUILTIN PF_memcmp (pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
+{
+	int qcdst = G_INT(OFS_PARM0);
+	int qcsrc = G_INT(OFS_PARM1);
+	int size = G_INT(OFS_PARM2);
+	int srcoffset = (prinst->callargc>3)?G_INT(OFS_PARM3):0;
+	int dstoffset = (prinst->callargc>4)?G_INT(OFS_PARM4):0;
+	G_INT(OFS_RETURN) = 0;
+	if (size < 0)
+		PR_BIError(prinst, "PF_memcmp: invalid size\n");
+	else if (size)
+	{
+		void *dst = PR_PointerToNative_MoInvalidate(prinst, qcdst, dstoffset, size);
+		void *src = PR_PointerToNative_MoInvalidate(prinst, qcsrc, srcoffset, size);
+		if (!dst)
+			PR_BIError(prinst, "PF_memcmp: invalid dest\n");
+		else if (!src)
+			PR_BIError(prinst, "PF_memcmp: invalid source\n");
+		else
+			G_INT(OFS_RETURN) = memcmp(dst, src, size);
+	}
+}
 void QCBUILTIN PF_memcpy (pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)
 {
 	int qcdst = G_INT(OFS_PARM0);
diff --git a/engine/common/pr_common.h b/engine/common/pr_common.h
index dc248c05b..b249b26e1 100644
--- a/engine/common/pr_common.h
+++ b/engine/common/pr_common.h
@@ -579,6 +579,7 @@ void QCBUILTIN PF_base64decode(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 
 void QCBUILTIN PF_memalloc	(pubprogfuncs_t *prinst, struct globalvars_s *pr_globals);
 void QCBUILTIN PF_memfree	(pubprogfuncs_t *prinst, struct globalvars_s *pr_globals);
+void QCBUILTIN PF_memcmp	(pubprogfuncs_t *prinst, struct globalvars_s *pr_globals);
 void QCBUILTIN PF_memcpy	(pubprogfuncs_t *prinst, struct globalvars_s *pr_globals);
 void QCBUILTIN PF_memfill8	(pubprogfuncs_t *prinst, struct globalvars_s *pr_globals);
 void QCBUILTIN PF_memgetval	(pubprogfuncs_t *prinst, struct globalvars_s *pr_globals);
@@ -930,6 +931,7 @@ enum packagemanagerinfo_e
 	GPMI_AVAILABLE,		//whether it may be downloaded or not.
 	GPMI_FILESIZE,		//whether it may be downloaded or not.
 	GPMI_GAMEDIR,		//so you know which mod(s) its relevant for
+	GPMI_MAPS,		//so you know which mod(s) its relevant for
 };
 
 #ifdef TERRAIN
@@ -1060,6 +1062,7 @@ enum
 	globalfunction(CSQC_InputEvent,			"float(float evtype, float scanx, float chary, float devid)")	\
 	globalfunction(CSQC_Input_Frame,		"void()")/*EXT_CSQC_1*/	\
 	globalfunction(CSQC_RendererRestarted,	"void(string rendererdescription)")	\
+	globalfunction(CSQC_GenerateMaterial,	"string(string shadername)")	\
 	globalfunction(CSQC_ConsoleCommand,		"float(string cmd)")	\
 	globalfunction(CSQC_ConsoleLink,		"float(string text, string info)")	\
 	globalfunction(GameCommand,				"void(string cmdtext)")	/*DP extension*/\
diff --git a/engine/common/protocol.h b/engine/common/protocol.h
index f3e2dfa04..9420bcc34 100644
--- a/engine/common/protocol.h
+++ b/engine/common/protocol.h
@@ -74,6 +74,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#define PEXT_Q3BSP			PEXT_Q3BSP_
 #endif
 #define PEXT1_HIDEPROTOCOLS		(PEXT_Q3BSP_|PEXT_Q2BSP_|PEXT_HLBSP)	//These are hints for the server, and not useful to the client (they can figure stuff out themselves)
+//#define	PEXT1_DEPRECATED			(PEXT_SCALE|PEXT_TRANS|PEXT_ACCURATETIMINGS|PEXT_SOUNDDBL|PEXT_FATNESS|PEXT_HULLSIZE|PEXT_MODELDBL|PEXT_ENTITYDBL|PEXT_ENTITYDBL2|PEXT_COLOURMOD|PEXT_SPAWNSTATIC2|PEXT_256PACKETENTITIES|PEXT_SETATTACHMENT|PEXT_DPFLAGS)	//deprecated by replacementdeltas
+#define PEXT1_MVDSUPPORT			(PEXT1_CLIENTSUPPORT&~PEXT1_DEPRECATED&~PEXT1_HIDEPROTOCOLS)	//pext2 extensions to use when recording mvds.
 
 #define PEXT2_PRYDONCURSOR			0x00000001
 #define PEXT2_VOICECHAT				0x00000002
@@ -88,13 +90,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define PEXT2_LERPTIME				0x00000400	//fitz-bloat parity. redefines UF_16BIT as UF_LERPEND in favour of length coding.
 #define PEXT2_SERVERADVERTISE		~0u
 #define PEXT2_CLIENTSUPPORT			(PEXT2_PRYDONCURSOR|PEXT2_VOICECHAT|PEXT2_SETANGLEDELTA|PEXT2_REPLACEMENTDELTAS|PEXT2_MAXPLAYERS|PEXT2_PREDINFO|PEXT2_NEWSIZEENCODING|PEXT2_INFOBLOBS|PEXT2_STUNAWARE|PEXT2_VRINPUTS|PEXT2_LERPTIME) //warn if we see bits not listed here.
+#define PEXT2_DEPRECATEDORNEW		(PEXT2_INFOBLOBS|PEXT2_VRINPUTS|PEXT2_LERPTIME) //extensions that are outdated
+#define PEXT2_MVDSUPPORT			(PEXT2_CLIENTSUPPORT&~PEXT2_DEPRECATED&~PEXT2_STUNAWARE)	//pext2 extensions to use when recording mvds.
 
 //EzQuake/Mvdsv extensions. (use ezquake name, to avoid confusion about .mvd format and its protocol differences)
 #define EZPEXT1_FLOATENTCOORDS		0x00000001	//quirky - doesn't apply to broadcasts, just players+ents. this gives more precision, but will bug out if you try using it to increase map bounds in ways that may not be immediately apparent. iiuc this was added instead of fixing some inconsistent rounding...
 #define EZPEXT1_SETANGLEREASON		0x00000002	//specifies the reason for an svc_setangles call. the mvdsv implementation will fuck over any mods that writebyte them. we'd need to modify our preparse stuff to work around the issue.
-#define EZPEXT1_SERVERADVERTISE		EZPEXT1_FLOATENTCOORDS/* - implemented, but interactions with replacementdeltas is not defined*/ /*EZPEXT1_SETANGLEREASON - potentially causes compat issues with mods that stuffcmd it (common in nq)*/
+//#define EZPEXT1_SERVERSIDEWEAPON	0x00000004	//looks half-baked. would be better to predict grabs clientside (oh noes! backpack knowledge!).
+//#define EZPEXT1_DEBUG_WEAPON		0x00000008	//debug? not gonna bother.
+//#define EZPEXT1_DEBUG_ANTILAG		0x00000010	//debug? not gonna bother.
+#define EZPEXT1_HIDDEN_MESSAGES		0x00000020	//mvd bloat. shouldn't be seen on actual servers.
+
+
+//#define MVD_PEXT1_SERVERSIDEWEAPON  (1 <<  2) // Server-side weapon selection
+#define MVD_PEXT1_DEBUG_WEAPON      (1 <<  3) // Send weapon-choice explanation to server for logging
+#define MVD_PEXT1_DEBUG_ANTILAG     (1 <<  4) // Send predicted positions to server (compare to antilagged positions)
+#define MVD_PEXT1_HIDDEN_MESSAGES   (1 <<  5) // dem_multiple(0) packets are in format (<length> <type-id>+ <packet-data>)*
+
+
+#define EZPEXT1_SERVERADVERTISE		(EZPEXT1_FLOATENTCOORDS/* - implemented, but interactions with replacementdeltas is not defined*/ /*|EZPEXT1_SETANGLEREASON - potentially causes compat issues with mods that stuffcmd it (common in nq)*/)
 #define EZPEXT1_CLIENTADVERTISE		EZPEXT1_FLOATENTCOORDS			//might as well ask for it, as a way around mvdsv's writecoord/PM_NudgePosition rounding difference bug.
-#define EZPEXT1_CLIENTSUPPORT		(EZPEXT1_FLOATENTCOORDS|EZPEXT1_SETANGLEREASON)	//ones we can support in demos. warning if other bits.
+#define EZPEXT1_CLIENTSUPPORT		(EZPEXT1_FLOATENTCOORDS|EZPEXT1_SETANGLEREASON|EZPEXT1_HIDDEN_MESSAGES)	//ones we can support in demos. warning if other bits.
 
 //ZQuake transparent protocol extensions.
 #define Z_EXT_PM_TYPE		(1<<0)	// basic PM_TYPE functionality (reliable jump_held)
@@ -555,12 +571,12 @@ enum {
 
 //==============================================
 
-#define DLERR_FILENOTFOUND	-1	//server cannot serve the file
-#define DLERR_PERMISSIONS	-2	//server refuses to serve the file
-#define DLERR_UNKNOWN		-3	//server bugged out while trying to serve the request
-#define DLERR_REDIRECTFILE	-4	//client should download the specified file instead.
-#define DLERR_REDIRECTPACK	-5	//client should download the specified package instead.
-#define DLERR_PACKAGE		-6	//not networked. packages require special file access.
+#define DLERR_FILENOTFOUND		-1	//server cannot serve the file
+#define DLERR_PERMISSIONS		-2	//server refuses to serve the file
+#define DLERR_UNKNOWN			-3	//server bugged out while trying to serve the request
+#define DLERR_REDIRECTFILE		-4	//client should download the specified file instead.
+#define DLERR_SV_REDIRECTPACK	-5	//client should download the specified package instead. may also be an http(s):// location.
+#define DLERR_SV_PACKAGE		-6	//not networked. packages require special file access.
 
 #define DLBLOCKSIZE			1024 //chunked downloads use fixed-size chunks (which I somewhat regret, but too late now I guess, really ought to use ranges.).
 
@@ -1854,15 +1870,15 @@ typedef struct q1usercmd_s
 #define MAX_MAP_AREA_BYTES		32
 
 // edict->drawflags (hexen2 stuff)
-#define MLS_MASK				7	// Model Light Style
+#define MLS_MASK				7
 #define MLS_NONE				0
-#define MLS_FULLBRIGHT			1
-#define MLS_POWERMODE			2
-#define MLS_TORCH				3
-#define MLS_TOTALDARK			4
-#define MLS_UNUSED				4
-#define MLS_ADDLIGHT			6
-#define MLS_ABSLIGHT			(MLS_MASK)
+#define MLS_LIGHTSTYLE25		1	//indexes style 25 instead of using real lighting info
+#define MLS_LIGHTSTYLE26		2	//indexes style 26
+#define MLS_LIGHTSTYLE27		3	//27
+#define MLS_LIGHTSTYLE28		4	//...
+#define MLS_LIGHTSTYLE29		5	//duh
+#define MLS_ADDLIGHT			6	//adds abslight to normal lighting
+#define MLS_ABSLIGHT			(MLS_MASK)	//uses abslight specifically.
 #define SCALE_TYPE_MASK			(SCALE_TYPE_UNIFORM|SCALE_TYPE_XYONLY|SCALE_TYPE_ZONLY)
 #define SCALE_TYPE_UNIFORM		0	// Scale X, Y, and Z
 #define SCALE_TYPE_XYONLY		8	// Scale X and Y
@@ -1873,7 +1889,7 @@ typedef struct q1usercmd_s
 #define SCALE_ORIGIN_BOTTOM		32	// Scaling origin at object bottom
 #define SCALE_ORIGIN_TOP		64	// Scaling origin at object top
 #define SCALE_ORIGIN_ORIGIN		(SCALE_ORIGIN_TOP|SCALE_ORIGIN_BOTTOM)	// Scaling origin at object origin
-#define DRF_TRANSLUCENT			128
+#define DRF_TRANSLUCENT			128	//alpha is controlled by r_wateralpha
 
 
 //TENEBRAE_GFX_DLIGHTS
diff --git a/engine/common/q1bsp.c b/engine/common/q1bsp.c
index 7f8fc1f22..51cde6ef1 100644
--- a/engine/common/q1bsp.c
+++ b/engine/common/q1bsp.c
@@ -1339,14 +1339,14 @@ static unsigned int Q1BSP_TranslateContents(enum q1contents_e contents)
 	case Q1CONTENTS_LAVA:			return FTECONTENTS_LAVA;
 	case Q1CONTENTS_SKY:			return FTECONTENTS_SKY|FTECONTENTS_PLAYERCLIP|FTECONTENTS_MONSTERCLIP;
 	case Q1CONTENTS_LADDER:			return FTECONTENTS_LADDER;
-	case Q1CONTENTS_CLIP:			return FTECONTENTS_PLAYERCLIP|FTECONTENTS_MONSTERCLIP;
-	case Q1CONTENTS_CURRENT_0:		return FTECONTENTS_WATER|Q2CONTENTS_CURRENT_0;		//q2 is better than nothing, right?
-	case Q1CONTENTS_CURRENT_90:		return FTECONTENTS_WATER|Q2CONTENTS_CURRENT_90;
-	case Q1CONTENTS_CURRENT_180:	return FTECONTENTS_WATER|Q2CONTENTS_CURRENT_180;
-	case Q1CONTENTS_CURRENT_270:	return FTECONTENTS_WATER|Q2CONTENTS_CURRENT_270;
-	case Q1CONTENTS_CURRENT_UP:		return FTECONTENTS_WATER|Q2CONTENTS_CURRENT_UP;
-	case Q1CONTENTS_CURRENT_DOWN:	return FTECONTENTS_WATER|Q2CONTENTS_CURRENT_DOWN;
-	case Q1CONTENTS_TRANS:			return FTECONTENTS_SOLID;
+	case HLCONTENTS_CLIP:			return FTECONTENTS_PLAYERCLIP|FTECONTENTS_MONSTERCLIP;
+	case HLCONTENTS_CURRENT_0:		return FTECONTENTS_WATER|Q2CONTENTS_CURRENT_0;		//q2 is better than nothing, right?
+	case HLCONTENTS_CURRENT_90:		return FTECONTENTS_WATER|Q2CONTENTS_CURRENT_90;
+	case HLCONTENTS_CURRENT_180:	return FTECONTENTS_WATER|Q2CONTENTS_CURRENT_180;
+	case HLCONTENTS_CURRENT_270:	return FTECONTENTS_WATER|Q2CONTENTS_CURRENT_270;
+	case HLCONTENTS_CURRENT_UP:		return FTECONTENTS_WATER|Q2CONTENTS_CURRENT_UP;
+	case HLCONTENTS_CURRENT_DOWN:	return FTECONTENTS_WATER|Q2CONTENTS_CURRENT_DOWN;
+	case HLCONTENTS_TRANS:			return FTECONTENTS_EMPTY;
 	case Q1CONTENTS_MONSTERCLIP:	return FTECONTENTS_MONSTERCLIP;
 	case Q1CONTENTS_PLAYERCLIP:		return FTECONTENTS_PLAYERCLIP;
 	case Q1CONTENTS_CORPSE:			return FTECONTENTS_CORPSE;
@@ -1420,7 +1420,7 @@ void Q1BSP_LoadBrushes(model_t *model, bspx_header_t *bspx, void *mod_base)
 	q2cbrush_t *brush;
 	q2cbrushside_t *sides;	//grr!
 	mplane_t *planes;	//bulky?
-	unsigned int lumpsizeremaining;
+	size_t lumpsizeremaining;
 	unsigned int numplanes;
 
 	unsigned int srcver, srcmodelidx, modbrushes, modplanes;
@@ -2560,26 +2560,30 @@ BSPX Stuff
 
 typedef struct {
     char lumpname[24]; // up to 23 chars, zero-padded
-    int fileofs;  // from file start
-    int filelen;
+    unsigned int fileofs;  // from file start
+    unsigned int filelen;
 } bspx_lump_t;
 struct bspx_header_s {
     char id[4];  // 'BSPX'
-    int numlumps;
+    unsigned int numlumps;
 	bspx_lump_t lumps[1];
 };
-//supported lumps:
+//supported lumps (read specs/bspx.txt for more details):
 //RGBLIGHTING (.lit)
 //LIGHTING_E5BGR9 (hdr lit)
 //LIGHTINGDIR (.lux)
-//LMSHIFT (lightmap scaling)
-//LMOFFSET (lightmap scaling)
-//LMSTYLE (lightmap scaling)
+//LMSHIFT (lightmap scaling, obsoleted bby DECOUPLED_LM)
+//LMOFFSET (lightmap scaling, redundant without LMSHIFT)
+//LMSTYLE (for when 4 styles per face are not enough)
+//LMSTYLE16 (for when you need more than 256 different lightswitches)
 //VERTEXNORMALS (smooth specular)
 //BRUSHLIST (no hull size issues)
 //ENVMAP (cubemaps)
 //SURFENVMAP (cubemaps)
-void *BSPX_FindLump(bspx_header_t *bspxheader, void *mod_base, char *lumpname, int *lumpsize)
+//FACENORMALS (because Quetoo's normals were rejected by ericw for some reason)
+//DECOUPLED_LM (upgraded alternative to LM_SHIFT with float scaling and explicit lm sizes)
+//LIGHTGRID_OCTREE (lightgrid alternative to floor-based model lighting, but still stuck with 4 8bit ldr styles)
+void *BSPX_FindLump(bspx_header_t *bspxheader, void *mod_base, char *lumpname, size_t *lumpsize)
 {
 	int i;
 	*lumpsize = 0;
@@ -2751,12 +2755,12 @@ void BSPX_RenderEnvmaps(model_t *mod)
 					stride = -stride;
 				if (SCR_ScreenShot(filename, FS_GAMEONLY, &buffer, 1, stride, cubesize, cubesize, fmt))
 				{
-					FS_NativePath(filename, FS_GAMEONLY, sysname, sizeof(sysname));
+					FS_SystemPath(filename, FS_GAMEONLY, sysname, sizeof(sysname));
 					Con_Printf ("Wrote %s\n", sysname);
 				}
 				else
 				{
-					FS_NativePath(filename, FS_GAMEONLY, sysname, sizeof(sysname));
+					FS_SystemPath(filename, FS_GAMEONLY, sysname, sizeof(sysname));
 					Con_Printf ("Failed to write %s\n", sysname);
 				}
 				BZ_Free(buffer);
@@ -2772,11 +2776,11 @@ void BSPX_RenderEnvmaps(model_t *mod)
 void BSPX_LoadEnvmaps(model_t *mod, bspx_header_t *bspx, void *mod_base)
 {
 	unsigned int *envidx, idx;
-	int i;
+	size_t i;
 	char base[MAX_QPATH];
 	char imagename[MAX_QPATH];
 	menvmap_t *out;
-	int count;
+	size_t count;
 	denvmap_t *in = BSPX_FindLump(bspx, mod_base, "ENVMAP", &count);
 	mod->envmaps = NULL;
 	mod->numenvmaps = 0;
@@ -2830,6 +2834,9 @@ struct bspxrw
 	size_t corelumps;
 	size_t totallumps;
 
+	void *archivedata;
+	qofs_t archivesize;
+
 	struct
 	{
 		char lumpname[24]; // up to 23 chars, zero-padded
@@ -2837,14 +2844,14 @@ struct bspxrw
 		qofs_t filelen;
 	} *lumps;
 };
-void Mod_BSPXRW_Free(struct bspxrw *ctx)
+static void Mod_BSPXRW_Free(struct bspxrw *ctx)
 {
 	FS_FreeFile(ctx->origfile);
 	Z_Free(ctx->lumps);
 	ctx->corelumps = ctx->totallumps = 0;
 	ctx->origfile = NULL;
 }
-void Mod_BSPXRW_Write(struct bspxrw *ctx)
+static void Mod_BSPXRW_Write(struct bspxrw *ctx)
 {
 #if 1
 	vfsfile_t *f = FS_OpenVFS(ctx->fname, "wb", FS_GAMEONLY);
@@ -2889,6 +2896,9 @@ void Mod_BSPXRW_Write(struct bspxrw *ctx)
 			VFS_WRITE(f, &paddata, pad);
 		}
 
+		//now reinsert any concatenated zip.
+		VFS_WRITE(f, ctx->archivedata, ctx->archivesize);
+
 		//now rewrite both sets of offsets.
 		VFS_SEEK(f, ctx->lumpofs);
 		VFS_WRITE(f, lumps, sizeof(lumps[0])*ctx->corelumps);
@@ -2901,16 +2911,18 @@ void Mod_BSPXRW_Write(struct bspxrw *ctx)
 	Mod_BSPXRW_Free(ctx);
 }
 
-void Mod_BSPXRW_SetLump(struct bspxrw *ctx, const char *lumpname, void *data, size_t datasize)
+static qboolean Mod_BSPXRW_SetLump(struct bspxrw *ctx, const char *lumpname, void *data, size_t datasize)
 {
 	int i;
 	for (i = 0; i < ctx->totallumps; i++)
 	{
 		if (!strcmp(ctx->lumps[i].lumpname, lumpname))
 		{	//replace the existing lump
+			if (ctx->lumps[i].filelen == datasize && !memcmp(ctx->lumps[i].data, data, datasize))
+				return false;	//nothing changed.
 			ctx->lumps[i].data = data;
 			ctx->lumps[i].filelen = datasize;
-			return;
+			return true;
 		}
 	}
 
@@ -2918,9 +2930,10 @@ void Mod_BSPXRW_SetLump(struct bspxrw *ctx, const char *lumpname, void *data, si
 	Q_strncpyz(ctx->lumps[i].lumpname, lumpname, sizeof(ctx->lumps[i].lumpname));
 	ctx->lumps[i].data = data;
 	ctx->lumps[i].filelen = datasize;
+	return true;
 }
 
-qboolean Mod_BSPXRW_Read(struct bspxrw *ctx, const char *fname)
+static qboolean Mod_BSPXRW_Read(struct bspxrw *ctx, const char *fname)
 {
 	int i;
 	lump_t *l;
@@ -2937,6 +2950,8 @@ qboolean Mod_BSPXRW_Read(struct bspxrw *ctx, const char *fname)
 	static const char *q2corelumpnames[Q2HEADER_LUMPS] = {"entities","planes","vertexes","visibility","nodes","texinfo","faces","lighting","leafs","leaffaces","leafbrushes","edges","surfedges","models","brushes","brushsides","pop","areas","areaportals"};
 #endif
 	static const char *q1corelumpnames[HEADER_LUMPS] = {"entities","planes","textures","vertexes","visibility","nodes","texinfo","faces","lighting","clipnodes","leafs","marksurfaces","edges","surfedges","models"};
+	ctx->archivedata = NULL;
+	ctx->archivesize = 0;
 	ctx->fname = fname;
 	ctx->origfile = FS_MallocFile(ctx->fname, FS_GAME, &ctx->origsize);
 	if (!ctx->origfile)
@@ -3035,7 +3050,7 @@ qboolean Mod_BSPXRW_Read(struct bspxrw *ctx, const char *fname)
 	return true;
 }
 
-unsigned int Mod_NearestCubeForSurf(msurface_t *surf, denvmap_t *envmap, size_t nenvmap)
+static unsigned int Mod_NearestCubeForSurf(msurface_t *surf, denvmap_t *envmap, size_t nenvmap)
 {	//this is slow, yes.
 	size_t n, v;
 	unsigned int best = ~0;
@@ -3070,7 +3085,7 @@ unsigned int Mod_NearestCubeForSurf(msurface_t *surf, denvmap_t *envmap, size_t
 	return best;
 }
 
-int QDECL envmapsort(const void *av, const void *bv)
+static int QDECL envmapsort(const void *av, const void *bv)
 {	//sorts cubemaps in order of size, to make texturearrays easier, if ever. The loader can then just make runs.
 	const denvmap_t *a=av, *b=bv;
 	if (a->cubesize == b->cubesize)
@@ -3079,7 +3094,7 @@ int QDECL envmapsort(const void *av, const void *bv)
 		return 1;
 	return -1;
 }
-void Mod_FindCubemaps_f(void)
+static void Mod_FindCubemaps_f(void)
 {
 	struct bspxrw bspctx;
 	if (Mod_BSPXRW_Read(&bspctx, cl.worldmodel->name))
@@ -3180,13 +3195,27 @@ void Mod_FindCubemaps_f(void)
 		Z_Free(envmap);
 	}
 }
-void Mod_Realign_f(void)
+static void Mod_Realign_f(void)
 {
 	struct bspxrw bspctx;
 	if (Mod_BSPXRW_Read(&bspctx, cl.worldmodel->name))
 		Mod_BSPXRW_Write(&bspctx);
 }
-void Mod_BSPX_List_f(void)
+static searchpathfuncs_t *Mod_BSPX_List_ArchiveFile_handle;
+static void QDECL Mod_BSPX_List_ArchiveFile(int depth, const char *fname, fsbucket_t *filehandle, void *pathhandle)
+{
+	searchpathfuncs_t *archive = Mod_BSPX_List_ArchiveFile_handle;
+	flocation_t loc;
+	time_t mtime;
+	char timestr[MAX_QPATH], sizestr[MAX_QPATH];
+	archive->FindFile(archive, &loc, fname, pathhandle);
+	archive->FileStat(archive, &loc, &mtime);
+
+	*timestr = 0;
+	strftime(timestr,sizeof(timestr), "%Y-%m-%d %H:%M:%S", localtime(&mtime));
+	Con_Printf("\t\t%20s: %-12s %s\n", fname, FS_AbbreviateSize(sizestr,sizeof(sizestr), loc.len), timestr);
+}
+static void Mod_BSPX_List_f(void)
 {
 	int i;
 	struct bspxrw ctx;
@@ -3196,10 +3225,27 @@ void Mod_BSPX_List_f(void)
 	if (Mod_BSPXRW_Read(&ctx, fname))
 	{
 		Con_Printf("%s:\n", fname);
-		for (i = 0; i < ctx.corelumps; i++)
-			Con_Printf("\t%20s: %-12u csum:%08x\n", ctx.lumps[i].lumpname, (unsigned int)ctx.lumps[i].filelen, LittleLong (CalcHashInt(&hash_md4, ctx.lumps[i].data, ctx.lumps[i].filelen)));
-		for (     ; i < ctx.totallumps; i++)
-			Con_Printf("\t%20s: %-12u csum:%08x\n", ctx.lumps[i].lumpname, (unsigned int)ctx.lumps[i].filelen, LittleLong (CalcHashInt(&hash_md4, ctx.lumps[i].data, ctx.lumps[i].filelen)));
+		for (i = 0; i < ctx.totallumps; i++)
+			Con_Printf("\t%20s: %-12"PRIuQOFS" csum:%08x\n", ctx.lumps[i].lumpname, ctx.lumps[i].filelen, LittleLong (CalcHashInt(&hash_md4, ctx.lumps[i].data, ctx.lumps[i].filelen)));
+		if (ctx.archivesize)
+		{
+			searchpathfuncs_t *f;
+			vfsfile_t *tmp = VFSPIPE_Open(1,true);
+			if (tmp)
+			{
+				VFS_WRITE(tmp, ctx.archivedata, ctx.archivesize);
+				f = FSZIP_LoadArchive(tmp, NULL, ctx.fname, ctx.fname, NULL);
+				if (!f)
+					VFS_CLOSE(tmp);
+				else
+				{
+					Con_Printf("\t%20s: %-12"PRIuQOFS"\n", "archive", ctx.archivesize);
+					Mod_BSPX_List_ArchiveFile_handle = f;
+					f->BuildHash(f, 0, Mod_BSPX_List_ArchiveFile);
+					f->ClosePath(f);
+				}
+			}
+		}
 		Mod_BSPXRW_Free(&ctx);
 	}
 }
@@ -3230,6 +3276,83 @@ void Mod_BSPX_Strip_f(void)
 	}
 }
 
+static qbyte *Mod_BSPX_Injest_Read(qofs_t *sz, char *name, char *fnamefmt, ...)
+{
+	va_list		argptr;
+	char		fname[MAX_QPATH];
+	int i;
+
+	va_start (argptr, fnamefmt);
+	if (Q_vsnprintfz (fname,sizeof(fname), fnamefmt,argptr))
+		*fname = 0;
+	va_end (argptr);
+	if (!*fname)
+		return NULL;
+
+	for (i = 2; i < Cmd_Argc(); i++)
+	{
+		if (!Q_strcasecmp(Cmd_Argv(i), "all") || !Q_strcasecmp(Cmd_Argv(i), name))
+			return FS_MallocFile(fname, FS_GAME, sz);
+	}
+	Con_Printf("%s not requested\n", name);
+	return NULL;
+}
+static void Mod_BSPX_Injest_f(void)
+{
+	qbyte *tmp;
+	struct bspxrw ctx;
+	qboolean found = false;
+	qofs_t sz;
+	if (Cmd_Argc() <= 2)
+		Con_Printf("%s FILENAME <all|LUMPNAMELIST>: inserts external supplementary resources into the bsp. "CON_WARNING"REMEMBER TO BACK-UP FIRST!\n", Cmd_Argv(0));
+	else if (Mod_BSPXRW_Read(&ctx, Cmd_Argv(1)))
+	{
+		char noext[MAX_QPATH];
+		COM_StripExtension(ctx.fname, noext,sizeof(noext));
+		if (ctx.fg == fg_quake)
+		{
+			tmp = Mod_BSPX_Injest_Read(&sz, "lit", "%s.lit", noext);
+			if (tmp)
+			{
+				if (sz == 8+ctx.lumps[LUMP_LIGHTING].filelen*3 && !memcmp(tmp, "QLIT\0x01\x00\x00\x00", 8))
+					Con_Printf("Injesting sdr lit file\n"), found|=Mod_BSPXRW_SetLump(&ctx, "RGBLIGHTING", tmp+8, sz-8);		//ldr
+				else if (sz == 8+ctx.lumps[LUMP_LIGHTING].filelen*4 && !memcmp(tmp, "QLIT\0x01\x00\x01\x00", 8))
+					Con_Printf("Injesting hdr lit file\n"), found|=Mod_BSPXRW_SetLump(&ctx, "LIGHTING_E5BGR9", tmp+8, sz-8);	//hdr
+				FS_FreeFile(tmp);
+			}
+
+			tmp = Mod_BSPX_Injest_Read(&sz, "lux", "%s.lux", noext);
+			if (tmp)
+			{
+				if (sz == 8+ctx.lumps[LUMP_LIGHTING].filelen*3 && !memcmp(tmp, "QLIT\0x01\x00\x00\x00", 8))
+					Con_Printf("Injesting lux file\n"), found|=Mod_BSPXRW_SetLump(&ctx, "LIGHTINGDIR", tmp+8, sz-8);
+				FS_FreeFile(tmp);
+			}
+
+			tmp = Mod_BSPX_Injest_Read(&sz, "ent", "%s.ent", noext);
+			if (tmp)
+			{
+				if (sz)
+					Con_Printf("Injesting ent file\n"), found|=Mod_BSPXRW_SetLump(&ctx, "entities", tmp, sz);
+				FS_FreeFile(tmp);
+			}
+
+//			tmp = Mod_BSPX_Injest_Read(&sz, "vis", "%s.vis", noext);
+//			tmp = Mod_BSPX_Injest_Read(&sz, "rtlights", "%s.rtlights", noext);
+//			tmp = Mod_BSPX_Injest_Read(&sz, "way", "%s.way", noext);
+			//fixme: cubemaps
+		}
+
+		if (found)
+			Mod_BSPXRW_Write(&ctx);
+		else
+		{
+			Mod_BSPXRW_Free(&ctx);
+			Con_Printf("%s \"%s\": nothing changed.\n", Cmd_Argv(0), Cmd_Argv(1));
+		}
+	}
+}
+
 image_t *Mod_CubemapForOrigin(model_t *wmodel, vec3_t org)
 {
 	int i;
@@ -3252,4 +3375,13 @@ image_t *Mod_CubemapForOrigin(model_t *wmodel, vec3_t org)
 	return ret;
 }
 
+void Mod_BSPX_Init(void)
+{
+	Cmd_AddCommandD("mod_findcubemaps", Mod_FindCubemaps_f, "Scans the entities of a map to find reflection env_cubemap sites and determines the nearest one to each surface.");
+	Cmd_AddCommandD("mod_realign", Mod_Realign_f, "Reads the named bsp and writes it back out with only alignment changes.");
+	Cmd_AddCommandD("mod_bspx_list", Mod_BSPX_List_f, "Lists all lumps (and their sizes) in the specified bsp.");
+	Cmd_AddCommandD("mod_bspx_strip", Mod_BSPX_Strip_f, "Strips a named extension lump from a bsp file.");
+	Cmd_AddCommandD("mod_bspx_injest", Mod_BSPX_Injest_f, "Injests supplemental files (like .lits) into a new bspx file. "CON_WARNING"REMEMBER TO BACK-UP FIRST!");
+}
+
 #endif
diff --git a/engine/common/qvm.c b/engine/common/qvm.c
index 592893373..b31a24993 100644
--- a/engine/common/qvm.c
+++ b/engine/common/qvm.c
@@ -80,6 +80,7 @@ qboolean QVM_LoadDLL(vm_t *vm, const char *name, qboolean binroot, void **vmMain
 
 	char fname[MAX_OSPATH*2];
 	char gpath[MAX_OSPATH];
+	char displaypath[MAX_OSPATH*2];
 	void *iterator;
 
 	dllfunction_t funcs[] =
@@ -102,49 +103,53 @@ qboolean QVM_LoadDLL(vm_t *vm, const char *name, qboolean binroot, void **vmMain
 		while (!hVM && COM_IteratePaths(&iterator, NULL, 0, gpath, sizeof(gpath)))
 		{
 #ifndef ANDROID
-			if (!hVM && FS_NativePath(va("%s_%s_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name, gpath), FS_BINARYPATH, fname, sizeof(fname)))
+			if (!hVM && FS_SystemPath(va("%s_%s_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name, gpath), FS_BINARYPATH, fname, sizeof(fname)))
 			{
-				Con_DLPrintf(2, "Loading native: %s\n", fname);
+				if (FS_DisplayPath(fname, FS_SYSTEM, displaypath, sizeof(displaypath)))
+					Con_DLPrintf(2, "Loading native: %s\n", displaypath);
 				hVM = Sys_LoadLibrary(fname, funcs);
 			}
 #endif
-			if (!hVM && FS_NativePath(va("%s_%s"ARCH_DL_POSTFIX, name, gpath), FS_BINARYPATH, fname, sizeof(fname)))
+			if (!hVM && FS_SystemPath(va("%s_%s"ARCH_DL_POSTFIX, name, gpath), FS_BINARYPATH, fname, sizeof(fname)))
 			{
-				Con_DLPrintf(2, "Loading native: %s\n", fname);
+				if (FS_DisplayPath(fname, FS_SYSTEM, displaypath, sizeof(displaypath)))
+					Con_DLPrintf(2, "Loading native: %s\n", displaypath);
 				hVM = Sys_LoadLibrary(fname, funcs);
 			}
 
 #ifndef ANDROID
-			if (!hVM && FS_NativePath(va("%s_%s_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name, gpath), FS_ROOT, fname, sizeof(fname)))
+			if (!hVM && FS_SystemPath(va("%s_%s_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name, gpath), FS_ROOT, fname, sizeof(fname)))
 			{
-				Con_DLPrintf(2, "Loading native: %s\n", fname);
+				if (FS_DisplayPath(fname, FS_SYSTEM, displaypath, sizeof(displaypath)))
+					Con_DLPrintf(2, "Loading native: %s\n", displaypath);
 				hVM = Sys_LoadLibrary(fname, funcs);
 			}
 #endif
-			if (!hVM && FS_NativePath(va("%s_%s"ARCH_DL_POSTFIX, name, gpath), FS_ROOT, fname, sizeof(fname)))
+			if (!hVM && FS_SystemPath(va("%s_%s"ARCH_DL_POSTFIX, name, gpath), FS_ROOT, fname, sizeof(fname)))
 			{
-				Con_DLPrintf(2, "Loading native: %s\n", fname);
+				if (FS_DisplayPath(fname, FS_SYSTEM, displaypath, sizeof(displaypath)))
+					Con_DLPrintf(2, "Loading native: %s\n", displaypath);
 				hVM = Sys_LoadLibrary(fname, funcs);
 			}
 		}
 
 #ifdef ANDROID
-		if (!hVM && FS_NativePath(va("%s" ARCH_DL_POSTFIX, name), FS_BINARYPATH, fname, sizeof(fname)))
+		if (!hVM && FS_SystemPath(va("%s" ARCH_DL_POSTFIX, name), FS_BINARYPATH, fname, sizeof(fname)))
 			hVM = Sys_LoadLibrary(fname, funcs);
 #else
 
-		if (!hVM && FS_NativePath(va("%s_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name), FS_BINARYPATH, fname, sizeof(fname)))
+		if (!hVM && FS_SystemPath(va("%s_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name), FS_BINARYPATH, fname, sizeof(fname)))
 			hVM = Sys_LoadLibrary(fname, funcs);
-		if (!hVM && FS_NativePath(va("%s"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name), FS_BINARYPATH, fname, sizeof(fname)))
+		if (!hVM && FS_SystemPath(va("%s"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name), FS_BINARYPATH, fname, sizeof(fname)))
 			hVM = Sys_LoadLibrary(fname, funcs);
-		if (!hVM && FS_NativePath(va("%s" ARCH_DL_POSTFIX, name), FS_BINARYPATH, fname, sizeof(fname)))
+		if (!hVM && FS_SystemPath(va("%s" ARCH_DL_POSTFIX, name), FS_BINARYPATH, fname, sizeof(fname)))
 			hVM = Sys_LoadLibrary(fname, funcs);
 
-		if (!hVM && FS_NativePath(va("%s_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name), FS_ROOT, fname, sizeof(fname)))
+		if (!hVM && FS_SystemPath(va("%s_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name), FS_ROOT, fname, sizeof(fname)))
 			hVM = Sys_LoadLibrary(fname, funcs);
-		if (!hVM && FS_NativePath(va("%s"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name), FS_ROOT, fname, sizeof(fname)))
+		if (!hVM && FS_SystemPath(va("%s"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, name), FS_ROOT, fname, sizeof(fname)))
 			hVM = Sys_LoadLibrary(fname, funcs);
-		if (!hVM && FS_NativePath(va("%s" ARCH_DL_POSTFIX, name), FS_ROOT, fname, sizeof(fname)))
+		if (!hVM && FS_SystemPath(va("%s" ARCH_DL_POSTFIX, name), FS_ROOT, fname, sizeof(fname)))
 			hVM = Sys_LoadLibrary(fname, funcs);
 #endif
 	}
@@ -160,13 +165,15 @@ qboolean QVM_LoadDLL(vm_t *vm, const char *name, qboolean binroot, void **vmMain
 			if (!hVM)
 			{
 				snprintf (fname, sizeof(fname), "%s%s_"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, gpath, name);
-				Con_DLPrintf(2, "Loading native: %s\n", fname);
+				if (FS_DisplayPath(fname, FS_SYSTEM, displaypath, sizeof(displaypath)))
+					Con_DLPrintf(2, "Loading native: %s\n", displaypath);
 				hVM = Sys_LoadLibrary(fname, funcs);
 			}
 			if (!hVM)
 			{
 				snprintf (fname, sizeof(fname), "%s%s"ARCH_CPU_POSTFIX ARCH_DL_POSTFIX, gpath, name);
-				Con_DLPrintf(2, "Loading native: %s\n", fname);
+				if (FS_DisplayPath(fname, FS_SYSTEM, displaypath, sizeof(displaypath)))
+					Con_DLPrintf(2, "Loading native: %s\n", displaypath);
 				hVM = Sys_LoadLibrary(fname, funcs);
 			}
 
@@ -174,13 +181,15 @@ qboolean QVM_LoadDLL(vm_t *vm, const char *name, qboolean binroot, void **vmMain
 			if (!hVM)
 			{
 				snprintf (fname, sizeof(fname), "%s%s_"ARCH_ALTCPU_POSTFIX ARCH_DL_POSTFIX, gpath, name);
-				Con_DLPrintf(2, "Loading native: %s\n", fname);
+				if (FS_DisplayPath(fname, FS_SYSTEM, displaypath, sizeof(displaypath)))
+					Con_DLPrintf(2, "Loading native: %s\n", displaypath);
 				hVM = Sys_LoadLibrary(fname, funcs);
 			}
 			if (!hVM)
 			{
 				snprintf (fname, sizeof(fname), "%s%s"ARCH_ALTCPU_POSTFIX ARCH_DL_POSTFIX, gpath, name);
-				Con_DLPrintf(2, "Loading native: %s\n", fname);
+				if (FS_DisplayPath(fname, FS_SYSTEM, displaypath, sizeof(displaypath)))
+					Con_DLPrintf(2, "Loading native: %s\n", displaypath);
 				hVM = Sys_LoadLibrary(fname, funcs);
 			}
 #endif
@@ -188,7 +197,8 @@ qboolean QVM_LoadDLL(vm_t *vm, const char *name, qboolean binroot, void **vmMain
 			if (!hVM)
 			{
 				snprintf (fname, sizeof(fname), "%s%s"ARCH_DL_POSTFIX, gpath, name);
-				Con_DLPrintf(2, "Loading native: %s\n", fname);
+				if (FS_DisplayPath(fname, FS_SYSTEM, displaypath, sizeof(displaypath)))
+					Con_DLPrintf(2, "Loading native: %s\n", displaypath);
 				hVM = Sys_LoadLibrary(fname, funcs);
 			}
 		}
diff --git a/engine/common/translate.c b/engine/common/translate.c
index 799fa8ed5..b3e86f841 100644
--- a/engine/common/translate.c
+++ b/engine/common/translate.c
@@ -21,7 +21,7 @@ static void QDECL TL_LanguageChanged(struct cvar_s *var, char *oldvalue)
 	com_language = TL_FindLanguage(var->string);
 }
 
-cvar_t language = CVARAFC("lang", sys_language, "prvm_language", CVAR_USERINFO|CVAR_NORESET/*otherwise gamedir switches will be annoying*/, TL_LanguageChanged);
+cvar_t language = CVARAFCD("lang", sys_language, "prvm_language", CVAR_USERINFO|CVAR_NORESET/*otherwise gamedir switches will be annoying*/, TL_LanguageChanged, "This cvar contains the language_dialect code of your language, used to find localisation strings.");
 
 void TranslateInit(void)
 {
diff --git a/engine/common/zone.c b/engine/common/zone.c
index 51e5471a8..bed90be52 100644
--- a/engine/common/zone.c
+++ b/engine/common/zone.c
@@ -829,6 +829,10 @@ void Memory_Init (void)
 	mainzone = Hunk_AllocName ( zonesize, "zone" );
 	Z_ClearZone (mainzone, zonesize);
 #endif
+
+#ifdef MULTITHREAD
+	Sys_ThreadsInit();
+#endif
 }
 
 void Memory_DeInit(void)
diff --git a/engine/d3d/vid_d3d.c b/engine/d3d/vid_d3d.c
index fe8977902..1e048ebab 100644
--- a/engine/d3d/vid_d3d.c
+++ b/engine/d3d/vid_d3d.c
@@ -1234,6 +1234,13 @@ static void D3D9_SetupViewPortProjection(void)
 	Matrix4x4_CM_ModelViewMatrixFromAxis(r_refdef.m_view, vpn, vright, vup, r_refdef.vieworg);
 	d3d9error(IDirect3DDevice9_SetTransform(pD3DDev9, D3DTS_VIEW, (D3DMATRIX*)r_refdef.m_view));
 
+	if (r_xflip.ival)
+	{
+		fov_x *= -1;
+		r_refdef.flipcull ^= SHADER_CULL_FLIP;
+		fovv_x *= -1;
+	}
+
 	if (r_refdef.maxdist)
 	{
 		/*d3d projection matricies scale depth to 0 to 1*/
@@ -1258,6 +1265,7 @@ static void	(D3D9_R_RenderView)				(void)
 {
 	if (!r_norefresh.value)
 	{
+		int cull = r_refdef.flipcull;
 		Surf_SetupFrame();
 
 		if (!r_refdef.globalfog.density)
@@ -1293,13 +1301,14 @@ static void	(D3D9_R_RenderView)				(void)
 
 		R_SetFrustum (r_refdef.m_projection_std, r_refdef.m_view);
 		RQ_BeginFrame();
-		if (!(r_refdef.flags & RDF_NOWORLDMODEL))
-		{
-			if (cl.worldmodel)
-				P_DrawParticles ();
-		}
+//		if (!(r_refdef.flags & RDF_NOWORLDMODEL))
+//		{
+//			if (!r_refdef.recurse && !(r_refdef.flags & RDF_DISABLEPARTICLES))
+//				P_DrawParticles ();
+//		}
 		Surf_DrawWorld();
 		RQ_RenderBatchClear();
+		r_refdef.flipcull = cull;
 	}
 	D3D9_Set2D ();
 }
diff --git a/engine/d3d/vid_d3d11.c b/engine/d3d/vid_d3d11.c
index f8ee2e29b..6e2966c95 100644
--- a/engine/d3d/vid_d3d11.c
+++ b/engine/d3d/vid_d3d11.c
@@ -840,7 +840,10 @@ static qboolean initD3D11Device(HWND hWnd, rendererstate_t *info, PFN_D3D11_CREA
 		Con_Printf("D3D11 Adaptor: %S\n", adesc.Description);
 	}
 	else
+	{
 		adapt = NULL;
+		Con_Printf("D3D11 Adaptor: %s\n", "Unspecified");
+	}
 
 	if (FAILED(func(adapt, drivertype, NULL, flags,
 				flevels, sizeof(flevels)/sizeof(flevels[0]),
@@ -1018,6 +1021,9 @@ static void initD3D11(HWND hWnd, rendererstate_t *info)
 			Con_Printf("CreateDXGIFactory1 failed: %s\n", D3D_NameForResult(hr));
 		if (fact)
 		{
+			ULONGLONG devid = strtoull(info->subrenderer, NULL, 16);
+			vrsetup.deviceid[0] = (devid    )&0xffffffff;
+			vrsetup.deviceid[1] = (devid>>32)&0xffffffff;
 			if (info->vr)
 			{
 				if (!info->vr->Prepare(&vrsetup))
@@ -1025,22 +1031,22 @@ static void initD3D11(HWND hWnd, rendererstate_t *info)
 					info->vr->Shutdown();
 					info->vr = NULL;
 				}
-				else
-				{
-					int id = 0;
-					while (S_OK==IDXGIFactory1_EnumAdapters(fact, id++, &adapt))
-					{
-						DXGI_ADAPTER_DESC desc;
-						IDXGIAdapter_GetDesc(adapt, &desc);
-						if (desc.AdapterLuid.LowPart == vrsetup.deviceid[0] && desc.AdapterLuid.HighPart == vrsetup.deviceid[1])
-							break;
-						IDXGIAdapter_Release(adapt);
-						adapt = NULL;
-					}
-				}
 			}
 
-			if (!adapt)
+			if (vrsetup.deviceid[0] || vrsetup.deviceid[1])
+			{
+				int id = 0;
+				while (S_OK==IDXGIFactory1_EnumAdapters(fact, id++, &adapt))
+				{
+					DXGI_ADAPTER_DESC desc;
+					IDXGIAdapter_GetDesc(adapt, &desc);
+					if (desc.AdapterLuid.LowPart == vrsetup.deviceid[0] && desc.AdapterLuid.HighPart == vrsetup.deviceid[1])
+						break;
+					IDXGIAdapter_Release(adapt);
+					adapt = NULL;
+				}
+			}
+			else
 				IDXGIFactory1_EnumAdapters(fact, 0, &adapt);
 		}
 	}
@@ -1061,6 +1067,54 @@ static void initD3D11(HWND hWnd, rendererstate_t *info)
 	}
 }
 
+static qboolean D3D11_VID_EnumerateDevices(void *usercontext, void(*callback)(void *context, const char *devicename, const char *outputname, const char *desc))
+{
+	static dllhandle_t *dxgi;
+	static HRESULT (WINAPI *pCreateDXGIFactory1)(IID *riid, void **ppFactory);
+	static IID factiid = {0x770aae78, 0xf26f, 0x4dba, {0xa8, 0x29, 0x25, 0x3c, 0x83, 0xd1, 0xb3, 0x87}};
+	IDXGIFactory1 *fact = NULL;
+	dllfunction_t dxgifuncs[] =
+	{
+		{(void**)&pCreateDXGIFactory1, "CreateDXGIFactory1"},
+		{NULL}
+	};
+
+	if (!dxgi)
+		dxgi = Sys_LoadLibrary("dxgi", dxgifuncs);
+	if (!dxgi)
+		return true;
+
+	if (pCreateDXGIFactory1)
+	{
+		HRESULT hr;
+		hr = pCreateDXGIFactory1(&factiid, (void**)&fact);
+		if (FAILED(hr))
+			Con_Printf("CreateDXGIFactory1 failed: %s\n", D3D_NameForResult(hr));
+		if (fact)
+		{
+			IDXGIAdapter *adapt = NULL;
+			int id = 0;
+			char devname[128*4];
+			char dev[128*4];
+			DXGI_ADAPTER_DESC desc;
+			while (S_OK==IDXGIFactory1_EnumAdapters(fact, id++, &adapt))
+			{
+				IDXGIAdapter_GetDesc(adapt, &desc);
+
+				Q_snprintfz(devname,sizeof(devname), "Direct3D11 - %s", narrowen(dev,sizeof(dev), desc.Description));
+				Q_snprintfz(dev,sizeof(dev), "%"PRIx64, ((ULONGLONG)desc.AdapterLuid.HighPart<<32)|desc.AdapterLuid.LowPart);
+				callback(usercontext, dev, ""/*FIXME*/, devname);
+
+				IDXGIAdapter_Release(adapt);
+				adapt = NULL;
+			}
+
+			IDXGIFactory1_Release(fact);
+		}
+	}
+	return true;
+}
+
 static qboolean D3D11_VID_Init(rendererstate_t *info, unsigned char *palette)
 {
 	DWORD width = info->width;
@@ -1556,18 +1610,19 @@ static void D3D11_SetupViewPort(void)
 		fovv_y *= 1 + (((sin(cl.time * 3.0) + 1) * 0.015) * r_waterwarp.value);
 	}
 
+	if (r_xflip.ival)
+	{
+		fov_x *= -1;
+		r_refdef.flipcull ^= SHADER_CULL_FLIP;
+		fovv_x *= -1;
+	}
+
 	/*view matrix*/
 	Matrix4x4_CM_ModelViewMatrixFromAxis(r_refdef.m_view, vpn, vright, vup, r_refdef.vieworg);
-	if (r_refdef.maxdist)
-	{
-		Matrix4x4_CM_Projection_Far(r_refdef.m_projection_std, fov_x, fov_y, r_refdef.mindist, r_refdef.maxdist, false);
-		Matrix4x4_CM_Projection_Far(r_refdef.m_projection_view, fovv_x, fovv_y, r_refdef.mindist, r_refdef.maxdist, false);
-	}
-	else
-	{
-		Matrix4x4_CM_Projection_Inf(r_refdef.m_projection_std, fov_x, fov_y, r_refdef.mindist, false);
-		Matrix4x4_CM_Projection_Inf(r_refdef.m_projection_view, fovv_x, fovv_y, r_refdef.mindist, false);
-	}
+
+	/*projection matricies (main game, and viewmodel)*/
+	Matrix4x4_CM_Projection_Offset(r_refdef.m_projection_std,  -fov_x/2, fov_x/2, -fov_y/2, fov_y/2, r_refdef.mindist, r_refdef.maxdist, true);
+	Matrix4x4_CM_Projection_Offset(r_refdef.m_projection_view, -fovv_x/2, fovv_x/2, -fovv_y/2, fovv_y/2, r_refdef.mindist, r_refdef.maxdist, true);
 }
 
 static void	(D3D11_R_RenderView)				(void)
@@ -1575,6 +1630,7 @@ static void	(D3D11_R_RenderView)				(void)
 	float x, x2, y, y2;
 	double time1 = 0, time2 = 0;
 	qboolean dofbo = *r_refdef.rt_destcolour[0].texname || *r_refdef.rt_depth.texname;
+	int cull = r_refdef.flipcull;
 //	texid_t colourrt[1];
 
 	if (!r_norefresh.value)
@@ -1623,11 +1679,6 @@ static void	(D3D11_R_RenderView)				(void)
 
 		R_SetFrustum (r_refdef.m_projection_std, r_refdef.m_view);
 		RQ_BeginFrame();
-	//	if (!(r_refdef.flags & Q2RDF_NOWORLDMODEL))
-	//	{
-	//		if (cl.worldmodel)
-	//			P_DrawParticles ();
-	//	}
 		
 		if (!(r_refdef.flags & RDF_NOWORLDMODEL))
 			if (!r_worldentity.model || r_worldentity.model->loadstate != MLS_LOADED || !cl.worldmodel)
@@ -1637,13 +1688,21 @@ static void	(D3D11_R_RenderView)				(void)
 				R2D_FillBlock(r_refdef.vrect.x, r_refdef.vrect.y, r_refdef.vrect.width, r_refdef.vrect.height);
 				R2D_ImageColours(1, 1, 1, 1);
 
+				r_refdef.flipcull = cull;
 				if (dofbo)
 					D3D11_ApplyRenderTargets(false);
 				return;
 			}
+//		if (!(r_refdef.flags & RDF_NOWORLDMODEL))
+//		{
+//			if (!r_refdef.recurse && !(r_refdef.flags & RDF_DISABLEPARTICLES))
+//				P_DrawParticles ();
+//		}
 		Surf_DrawWorld();
 		RQ_RenderBatchClear();
 
+		r_refdef.flipcull = cull;
+
 		if (r_speeds.ival)
 		{
 			time2 = Sys_DoubleTime();
@@ -1739,6 +1798,9 @@ rendererinfo_t d3d11rendererinfo =
 
 	D3D11BE_RenderToTextureUpdate2d,
 
-	"no more"
+	"no more",
+	NULL,	//VID_GetPriority
+	NULL,	//VID_EnumerateVideoModes
+	D3D11_VID_EnumerateDevices
 };
 #endif
diff --git a/engine/gl/gl_alias.c b/engine/gl/gl_alias.c
index b397953b3..3b184fcca 100644
--- a/engine/gl/gl_alias.c
+++ b/engine/gl/gl_alias.c
@@ -37,14 +37,14 @@ typedef struct
 
 
 
-extern cvar_t gl_part_flame, r_fullbrightSkins, r_fb_models, ruleset_allow_fbmodels;
+extern cvar_t gl_part_flame, r_fullbrightSkins, r_fb_models, ruleset_allow_fbmodels, gl_overbright_models;
 extern cvar_t r_noaliasshadows;
 extern cvar_t r_lodscale, r_lodbias;
 
 extern cvar_t gl_ati_truform;
 extern cvar_t r_vertexdlights;
 extern cvar_t mod_md3flags;
-extern cvar_t r_skin_overlays;
+//extern cvar_t r_skin_overlays;
 extern cvar_t r_globalskin_first, r_globalskin_count;
 
 #ifndef SERVERONLY
@@ -1373,25 +1373,27 @@ qboolean R_CalcModelLighting(entity_t *e, model_t *clmodel)
 		return e->light_known-1;
 
 	e->light_dir[0] = 0; e->light_dir[1] = 1; e->light_dir[2] = 0;
-	if ((clmodel->engineflags & MDLF_FLAME) || r_fullbright.ival)
-	{
-		e->light_avg[0] = e->light_avg[1] = e->light_avg[2] = 1;
-		e->light_range[0] = e->light_range[1] = e->light_range[2] = 0;
-		e->light_known = 2;
-		return e->light_known-1;
-	}
-	if (
 #ifdef HEXEN2
-		(e->drawflags & MLS_MASK) == MLS_FULLBRIGHT ||
-#endif
-		(e->flags & RF_FULLBRIGHT))
-	{
-		e->light_avg[0] = e->light_avg[1] = e->light_avg[2] = 1;
-		e->light_range[0] = e->light_range[1] = e->light_range[2] = 0;
+	if ((e->drawflags & MLS_MASK) == MLS_ABSLIGHT)
+	{	//per-entity fixed lighting
+		e->light_range[0] = e->light_range[1] = e->light_range[2] =
+		e->light_avg[0] = e->light_avg[1] = e->light_avg[2] = e->abslight/255.f;
 		e->light_known = 2;
 		return e->light_known-1;
 	}
-	if (r_fb_models.ival == 1 && ruleset_allow_fbmodels.ival && (clmodel->engineflags & MDLF_EZQUAKEFBCHEAT) && cls.protocol == CP_QUAKEWORLD && cl.deathmatch)
+	if ((e->drawflags & MLS_MASK) && (e->drawflags & MLS_MASK) != MLS_ADDLIGHT)
+	{	//these use some qc-defined lightstyles.
+		i = 24 + (e->drawflags & MLS_MASK); //saves knowing the proper patterns at least.
+		VectorScale(cl_lightstyle[i].colours, d_lightstylevalue[i]/255.f, e->light_range);
+		VectorScale(cl_lightstyle[i].colours, d_lightstylevalue[i]/255.f, e->light_avg);
+		e->light_known = 2;
+		return e->light_known-1;
+	}
+#endif
+	if ((clmodel->engineflags & MDLF_FLAME) ||	//stuff on fire should generally have enough light...
+		r_fullbright.ival ||	//vanila cheat
+		(e->flags & RF_FULLBRIGHT) ||	//DP feature
+		(r_fb_models.ival == 1 && ruleset_allow_fbmodels.ival && (clmodel->engineflags & MDLF_EZQUAKEFBCHEAT) && cls.protocol == CP_QUAKEWORLD && cl.deathmatch))	//ezquake cheat
 	{
 		e->light_avg[0] = e->light_avg[1] = e->light_avg[2] = 1;
 		e->light_range[0] = e->light_range[1] = e->light_range[2] = 0;
@@ -1432,21 +1434,24 @@ qboolean R_CalcModelLighting(entity_t *e, model_t *clmodel)
 	}
 
 #ifdef HEXEN2
-	if ((e->drawflags & MLS_MASK) == MLS_ABSLIGHT)
+	if ((e->drawflags & MLS_MASK) == MLS_ADDLIGHT)
 	{
-		shadelight[0] = shadelight[1] = shadelight[2] = e->abslight;
-		ambientlight[0] = ambientlight[1] = ambientlight[2] = e->abslight;
+		ambientlight[0] += e->abslight;
+		ambientlight[1] += e->abslight;
+		ambientlight[2] += e->abslight;
+		shadelight[0] += e->abslight;
+		shadelight[1] += e->abslight;
+		shadelight[2] += e->abslight;
 	}
-	else
 #endif
 
-		if (r_softwarebanding)
+	if (r_softwarebanding)
 	{
 		//mimic software rendering as closely as possible
 		lightdir[2] = 0;	//horizontal light only.
 
-		VectorMA(vec3_origin, 0.5, shadelight, ambientlight);
-		VectorCopy(ambientlight, shadelight);
+//		VectorMA(vec3_origin, 0.5, shadelight, ambientlight);
+//		VectorCopy(ambientlight, shadelight);
 
 		if (!r_vertexdlights.ival && r_dynamic.ival > 0)
 		{
@@ -1495,17 +1500,6 @@ qboolean R_CalcModelLighting(entity_t *e, model_t *clmodel)
 	}
 	else
 	{
-#ifdef HEXEN2
-		if ((e->drawflags & MLS_MASK) == MLS_ADDLIGHT)
-		{
-			ambientlight[0] += e->abslight;
-			ambientlight[1] += e->abslight;
-			ambientlight[2] += e->abslight;
-			shadelight[0] += e->abslight;
-			shadelight[1] += e->abslight;
-			shadelight[2] += e->abslight;
-		}
-#endif
 		if (!r_vertexdlights.ival && r_dynamic.ival > 0)
 		{
 			float *org = e->origin;
@@ -1621,6 +1615,20 @@ qboolean R_CalcModelLighting(entity_t *e, model_t *clmodel)
 		}
 
 
+#if 1	//match quakespasm here.
+		if (gl_overbright_models.value > 0.f && ruleset_allow_fbmodels.ival)
+		{
+			m = (96*6) / (shadelight[0]+shadelight[1]+shadelight[2]+ambientlight[0]+ambientlight[1]+ambientlight[2]);
+			if (m > 1.0)
+				m = 1;	//we only want to let it darken here.
+			m *= 1 + min(1,gl_overbright_models.value);
+		}
+		else
+			m = 1;
+		m /= 200.0/255;	//a legacy quake fudge-factor.
+		VectorScale(shadelight, m, shadelight);
+		VectorScale(ambientlight, m, ambientlight);
+#else
 		for (i = 0; i < 3; i++)
 		{
 			if (ambientlight[i] > 128)
@@ -1629,6 +1637,7 @@ qboolean R_CalcModelLighting(entity_t *e, model_t *clmodel)
 			shadelight[i] /= 200.0/255;
 			ambientlight[i] /= 200.0/255;
 		}
+#endif
 
 		if ((e->model->flags & MF_ROTATE) && cl.hexen2pickups)
 		{
@@ -1675,6 +1684,11 @@ qboolean R_CalcModelLighting(entity_t *e, model_t *clmodel)
 		VectorScale(ambientlight, 2, e->light_avg);
 		VectorScale(shadelight, 2, e->light_range);
 	}
+	else if (1)
+	{	//calculate average and range, to allow for negative lighting dotproducts
+		VectorCopy(shadelight, e->light_avg);
+		VectorCopy(ambientlight, e->light_range);
+	}
 	else
 	{	//calculate average and range, to allow for negative lighting dotproducts
 		VectorMA(ambientlight, 0.5, shadelight, e->light_avg);
diff --git a/engine/gl/gl_backend.c b/engine/gl/gl_backend.c
index c48101417..6abe989bc 100644
--- a/engine/gl/gl_backend.c
+++ b/engine/gl/gl_backend.c
@@ -221,8 +221,6 @@ static void BE_PrintDrawCall(const char *msg)
 {
 	char shadername[512];
 	char modelname[512];
-	int num;
-
 	Q_snprintfz(shadername, sizeof(shadername), "^[%-16s\\tipimg\\%s\\tipimgtype\\%i\\tip\\%s^]",
 			shaderstate.curshader->name,
 			shaderstate.curshader->name,shaderstate.curshader->usageflags,
@@ -230,7 +228,9 @@ static void BE_PrintDrawCall(const char *msg)
 
 	if (shaderstate.curbatch && shaderstate.curbatch->ent)
 	{
-		num = shaderstate.curbatch->ent->keynum;
+#ifdef HAVE_SERVER
+		int num = shaderstate.curbatch->ent->keynum;
+#endif
 		if (shaderstate.curbatch->ent->model)
 			Q_snprintfz(modelname, sizeof(modelname), " - ^[%s\\modelviewer\\%s^]",
 				shaderstate.curbatch->ent->model->name, shaderstate.curbatch->ent->model->name);
diff --git a/engine/gl/gl_font.c b/engine/gl/gl_font.c
index 8eb6c1682..167480a17 100644
--- a/engine/gl/gl_font.c
+++ b/engine/gl/gl_font.c
@@ -2616,12 +2616,18 @@ struct font_s *Font_LoadFont(const char *fontfilename, float vheight, float scal
 
 			if (!success && !TEXLOADED(f->singletexture) && *start)
 			{
-				f->singletexture = R_LoadHiResTexture(start, "fonts:charsets", IF_PREMULTIPLYALPHA|(r_font_linear.ival?IF_LINEAR:IF_NEAREST)|IF_UIPIC|IF_NOPICMIP|IF_NOMIPMAP|IF_NOPURGE|IF_LOADNOW);
-				if (f->singletexture->status == TEX_LOADING)
-					COM_WorkerPartialSync(f->singletexture, &f->singletexture->status, TEX_LOADING);
+				const char *ext = COM_GetFileExtension(start, NULL);
+				if (!Q_strcasecmp(ext, ".ttf") || !Q_strcasecmp(ext, ".otf"))
+					;	//no, don't try loading it as an image-based font. just let it fail.
+				else
+				{
+					f->singletexture = R_LoadHiResTexture(start, "fonts:charsets", IF_PREMULTIPLYALPHA|(r_font_linear.ival?IF_LINEAR:IF_NEAREST)|IF_UIPIC|IF_NOPICMIP|IF_NOMIPMAP|IF_NOPURGE|IF_LOADNOW);
+					if (f->singletexture->status == TEX_LOADING)
+						COM_WorkerPartialSync(f->singletexture, &f->singletexture->status, TEX_LOADING);
 
-				if (!TEXLOADED(f->singletexture) && f->faces < MAX_FACES)
-					Font_LoadFontLump(f, start);
+					if (!TEXLOADED(f->singletexture) && f->faces < MAX_FACES)
+						Font_LoadFontLump(f, start);
+				}
 			}
 
 			if (end)
diff --git a/engine/gl/gl_heightmap.c b/engine/gl/gl_heightmap.c
index f8d694f31..a71edc063 100644
--- a/engine/gl/gl_heightmap.c
+++ b/engine/gl/gl_heightmap.c
@@ -86,22 +86,18 @@ void validatelinks2(link_t *firstnode, link_t *panic)
 }
 
 
-#ifndef SERVERONLY
-static void ted_dorelight(model_t *m, heightmap_t *hm);
-static void Terr_WorkerLoadedSectionLightmap(void *ctx, void *data, size_t a, size_t b);
-static qboolean Terr_Collect(heightmap_t *hm);
-#endif
 static hmsection_t *QDECL Terr_GetSection(heightmap_t *hm, int x, int y, unsigned int flags);
 static void Terr_LoadSectionWorker(void *ctx, void *data, size_t a, size_t b);
 static void Terr_WorkerLoadedSection(void *ctx, void *data, size_t a, size_t b);
 static void Terr_WorkerFailedSection(void *ctx, void *data, size_t a, size_t b);
 
 static void Terr_Brush_DeleteIdx(heightmap_t *hm, size_t idx);
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
+static void ted_dorelight(model_t *m, heightmap_t *hm);
+static void Terr_WorkerLoadedSectionLightmap(void *ctx, void *data, size_t a, size_t b);
+static qboolean Terr_Collect(heightmap_t *hm);
 static void Terr_Brush_Draw(heightmap_t *hm, batch_t **batches, entity_t *e);
-#endif
 
-#ifndef SERVERONLY
 static texid_t Terr_LoadTexture(char *name)
 {
 	extern texid_t missing_texture;
@@ -121,9 +117,9 @@ static texid_t Terr_LoadTexture(char *name)
 }
 #endif
 
-static void QDECL Terr_LoadSectionTextures(hmsection_t *s)
+static void Terr_LoadSectionTextures(hmsection_t *s)
 {
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	extern texid_t missing_texture;
 	struct hmwater_s *w;
 	if (isDedicated)
@@ -161,7 +157,7 @@ static void QDECL Terr_LoadSectionTextures(hmsection_t *s)
 
 static qboolean QDECL Terr_InitLightmap(hmsection_t *s, qboolean initialise)
 {
-#ifdef SERVERONLY
+#ifndef HAVE_CLIENT
 	return false;
 #else
 	heightmap_t *hm = s->hmmod;
@@ -283,7 +279,7 @@ static char *Terr_DiskSectionName(heightmap_t *hm, int sx, int sy, char *out, si
 	Q_snprintfz(out, outsize, "maps/%s/sect_%03x_%03x.hms", hm->path, sx, sy);
 	return out;
 }
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 static char *Terr_TempDiskSectionName(heightmap_t *hm, int sx, int sy)
 {
 	sx -= CHUNKBIAS;
@@ -295,6 +291,7 @@ static char *Terr_TempDiskSectionName(heightmap_t *hm, int sx, int sy)
 }
 #endif
 
+#ifdef HAVE_SERVER
 static int dehex_e(int i, qboolean *error)
 {
 	if      (i >= '0' && i <= '9')
@@ -357,6 +354,7 @@ static qboolean Terr_IsSectionFName(heightmap_t *hm, const char *fname, int *sx,
 		return false;
 	return true;
 }
+#endif
 
 static int QDECL Terr_GenerateSections(heightmap_t *hm, int sx, int sy, int count, hmsection_t **sects)
 {
@@ -381,7 +379,7 @@ static int QDECL Terr_GenerateSections(heightmap_t *hm, int sx, int sy, int coun
 			{
 				s = Z_Malloc(sizeof(*s));
 				s->loadstate = TSLS_LOADING0;
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 				s->lightmap = -1;
 #endif
 				s->numents = 0;
@@ -395,7 +393,7 @@ static int QDECL Terr_GenerateSections(heightmap_t *hm, int sx, int sy, int coun
 
 				hm->loadingsections+=1;
 			}
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 			else if (s->loadstate == TSLS_LOADED && s->lightmap < 0)
 				;	//it lost its lightmap. the main thread won't be drawing with it, nor do any loaders.
 					//FIXME: might be used by tracelines on a worker (eg lightmap generation)
@@ -438,11 +436,8 @@ static hmsection_t *QDECL Terr_GenerateSection(heightmap_t *hm, int sx, int sy,
 #endif
 			return NULL;
 		}
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 		s->lightmap = -1;
-#endif
-		
-#ifndef SERVERONLY
 		s->numents = 0;
 #endif
 
@@ -508,7 +503,7 @@ static void *QDECL Terr_GenerateWater(hmsection_t *s, float maxheight)
 //embeds a mesh
 static void QDECL Terr_AddMesh(heightmap_t *hm, int loadflags, model_t *mod, const char *modelname, vec3_t epos, vec3_t axis[3], float scale)
 {
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	struct hmentity_s *e, *f = NULL;
 	hmsection_t *s;
 	int min[2], max[2], coord[2];
@@ -639,7 +634,7 @@ static void QDECL Terr_AddMesh(heightmap_t *hm, int loadflags, model_t *mod, con
 
 static void *Terr_ReadV1(heightmap_t *hm, hmsection_t *s, void *ptr, int len)
 {
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	dsmesh_v1_t *dm;
 	float *colours;
 	qbyte *lmstart;
@@ -670,7 +665,7 @@ static void *Terr_ReadV1(heightmap_t *hm, hmsection_t *s, void *ptr, int len)
 
 	ptr = ds+1;
 
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	/*deal with textures*/
 	Q_strncpyz(s->texname[0], ds->texname[0], sizeof(s->texname[0]));
 	Q_strncpyz(s->texname[1], ds->texname[1], sizeof(s->texname[1]));
@@ -760,7 +755,7 @@ static char *Terr_Read_String(struct terrstream_s *strm, char *val, int maxlen)
 	strm->pos += len+1;
 	return val;
 }
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 static void Terr_Write_SInt(struct terrstream_s *strm, int val)
 {
 	val = LittleLong(val);
@@ -998,7 +993,7 @@ static void Terr_SaveV2(heightmap_t *hm, hmsection_t *s, vfsfile_t *f, int sx, i
 	VFS_WRITE(f, strm.buffer, strm.pos);
 	strm.pos = 0;
 }
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 static void Terr_WorkerLoadedSectionLightmap(void *ctx, void *data, size_t a, size_t b)
 {
 	heightmap_t *hm = ctx;
@@ -1027,7 +1022,7 @@ static void Terr_WorkerLoadedSectionLightmap(void *ctx, void *data, size_t a, si
 #endif
 static void *Terr_ReadV2(heightmap_t *hm, hmsection_t *s, void *ptr, int len)
 {
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	char modelname[MAX_QPATH];
 	qbyte last;
 	int y;
@@ -1100,7 +1095,7 @@ static void *Terr_ReadV2(heightmap_t *hm, hmsection_t *s, void *ptr, int len)
 
 	//dedicated server can stop reading here.
 
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	if (flags & TSF_HASCOLOURS)
 	{
 		for (i = 0; i < SECTHEIGHTSIZE*SECTHEIGHTSIZE; i++)
@@ -1226,7 +1221,7 @@ static void Terr_GenerateDefault(heightmap_t *hm, hmsection_t *s)
 
 	memset(s->holes, 0, sizeof(s->holes));
 
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	Q_strncpyz(s->texname[0], "", sizeof(s->texname[0]));
 	Q_strncpyz(s->texname[1], "", sizeof(s->texname[1]));
 	Q_strncpyz(s->texname[2], "", sizeof(s->texname[2]));
@@ -1416,7 +1411,7 @@ static hmsection_t *Terr_ReadSection(heightmap_t *hm, hmsection_t *s, int ver, v
 	return s;
 }
 
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 qboolean Terr_DownloadedSection(char *fname)
 {
 /*
@@ -1450,7 +1445,7 @@ qboolean Terr_DownloadedSection(char *fname)
 }
 #endif
 
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 static void Terr_LoadSection(heightmap_t *hm, hmsection_t *s, int sx, int sy, unsigned int flags)
 {
 	//when using networked terrain, the client will never load a section from disk, but will only load it from the server
@@ -1561,7 +1556,7 @@ static void Terr_LoadSectionWorker(void *ctx, void *data, size_t a, size_t b)
 	Terr_ReadSection(hm, s, 0, NULL, 0);
 }
 
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 static void Terr_SaveV1(heightmap_t *hm, hmsection_t *s, vfsfile_t *f, int sx, int sy)
 {
 	int i;
@@ -1681,7 +1676,7 @@ static void Terr_Save(heightmap_t *hm, hmsection_t *s, vfsfile_t *f, int sx, int
 //doesn't clear edited/dirty flags or anything
 static qboolean Terr_SaveSection(heightmap_t *hm, hmsection_t *s, int sx, int sy, qboolean blocksave)
 {
-#ifdef SERVERONLY
+#ifndef HAVE_CLIENT
 	return true;
 #else
 	vfsfile_t *f;
@@ -1804,7 +1799,7 @@ static hmsection_t *QDECL Terr_GetSection(heightmap_t *hm, int x, int y, unsigne
 			section = Terr_GenerateSection(hm, x, y, true);
 		}
 	}
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	//when using networked terrain, the client will never load a section from disk, but only loading it from the server
 	//this means we need to send a new request to download the section if it was flagged as modified.
 	if (!(flags & TGS_NODOWNLOAD))
@@ -1893,7 +1888,7 @@ int Heightmap_Save(heightmap_t *hm)
 	return sectionssaved;
 }
 
-#ifndef CLIENTONLY
+#ifdef HAVE_SERVER
 //on servers, we can get requests to download current map sections. if so, give them it.
 qboolean Terrain_LocateSection(const char *name, flocation_t *loc)
 {
@@ -1958,7 +1953,7 @@ void Terr_DestroySection(heightmap_t *hm, hmsection_t *s, qboolean lightmapreusa
 
 	Terr_ClearSection(s);
 
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	if (s->lightmap >= 0)
 	{
 		struct lmsect_s *lms;
@@ -2014,14 +2009,14 @@ void Terr_DestroySection(heightmap_t *hm, hmsection_t *s, qboolean lightmapreusa
 	validatelinks(&hm->recycle);
 }
 
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 //dedicated servers do not support editing. no lightmap info causes problems.
 
 //when a terrain section has the notify flag set on the server, the server needs to go through and set out notifications to replicate it to the various clients
 //so the clients know to re-download the section.
 static void Terr_DoEditNotify(heightmap_t *hm)
 {
-#ifndef CLIENTONLY
+#ifdef HAVE_SERVER
 	int i;
 	char *cmd;
 	hmsection_t *s;
@@ -2141,7 +2136,7 @@ validatelinks(&hm->recycle);
 			else if (lightmapsonly)
 			{
 				numremaining++;
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 				s->lightmap = -1;
 #endif
 			}
@@ -2160,7 +2155,7 @@ validatelinks(&hm->recycle);
 		}
 	}
 	validatelinks(&hm->recycle);
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	if (!lightmapreusable)
 	{
 		while (hm->unusedlmsects)
@@ -2196,7 +2191,7 @@ void Terr_FreeModel(model_t *mod)
 		while(hm->brushtextures)
 		{
 			brushtex_t *bt = hm->brushtextures;
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 			brushbatch_t *bb;
 			while((bb = bt->batches))
 			{
@@ -2211,7 +2206,7 @@ void Terr_FreeModel(model_t *mod)
 		}
 #ifdef RUNTIMELIGHTING
 		if (hm->relightcontext)
-			LightShutdown(hm->relightcontext);
+			LightShutdown(hm->relightcontext, mod);
 		if (hm->lightthreadmem && !hm->inheritedlightthreadmem)
 			BZ_Free(hm->lightthreadmem);
 #endif
@@ -2230,7 +2225,7 @@ void Terr_FreeModel(model_t *mod)
 	}
 }
 
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 void Terr_DrawTerrainWater(heightmap_t *hm, float *mins, float *maxs, struct hmwater_s *w)
 {
 	scenetris_t *t;
@@ -3451,6 +3446,38 @@ typedef struct {
 #endif
 } hmtrace_t;
 
+#ifdef HAVE_CLIENT
+shader_t *Terr_GetShader(model_t *mod, trace_t *trace)
+{
+
+	heightmap_t		*hm				= mod?mod->terrain:NULL;
+	unsigned int	brushid			= trace->brush_id;
+	unsigned int	fa, i;
+	brushes_t		*br;
+
+	if (!brushid)
+		return NULL;
+
+	if (!hm)
+		return NULL;
+
+	for (i = 0; i < hm->numbrushes; i++)
+	{
+		br = &hm->wbrushes[i];
+		if (br->id == trace->brush_id)
+		{
+			if (br->patch)
+				return br->patch->tex->shader;
+			fa = trace->brush_face-1;
+			if (fa >= br->numplanes)
+				return NULL;
+			return br->faces[fa].tex->shader;
+		}
+	}
+	return NULL;
+}
+#endif
+
 static int Heightmap_Trace_Brush(hmtrace_t *tr, vec4_t *planes, int numplanes, brushes_t *brushinfo)
 {
 	qboolean startout;
@@ -4405,7 +4432,7 @@ unsigned int Heightmap_FatPVS		(model_t *mod, const vec3_t org, pvsbuffer_t *fte
 	return sizeof(*hmpvs);
 }
 
-#ifndef CLIENTONLY
+#ifdef HAVE_SERVER
 qboolean Heightmap_EdictInFatPVS	(model_t *mod, const struct pvscache_s *edict, const qbyte *pvsdata, const int *areas)
 {
 	heightmap_t *hm = mod->terrain;
@@ -4472,7 +4499,7 @@ int	Heightmap_ClusterForPoint	(model_t *model, const vec3_t point, int *area)
 	return -1;
 }
 
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 static unsigned char *QDECL Terr_GetLightmap(hmsection_t *s, int idx, qboolean edit)
 {
 	int x = idx % SECTTEXSIZE, y = idx / SECTTEXSIZE;
@@ -5070,7 +5097,7 @@ void QCBUILTIN PF_terrain_edit(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 					mod->entityinfo[idx].id = 0;
 			}
 
-#ifndef CLIENTONLY
+#ifdef HAVE_SERVER
 			if (sv_state && modelindex > 0)
 			{
 				MSG_WriteByte(&sv.multicast, svcfte_brushedit);
@@ -5086,7 +5113,7 @@ void QCBUILTIN PF_terrain_edit(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 			}
 			else
 #endif
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 			if (cls.state && modelindex > 0)
 			{
 				MSG_WriteByte(&cls.netchan.message, clcfte_brushedit);
@@ -5494,7 +5521,7 @@ void Terr_ParseEntityLump(model_t *mod, heightmap_t *heightmap)
 
 void Terr_FinishTerrain(model_t *mod)
 {
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	heightmap_t *hm = mod->terrain;
 	if (qrenderer != QR_NONE)
 	{
@@ -5595,7 +5622,7 @@ void Terr_FinishTerrain(model_t *mod)
 #endif
 }
 
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 void Terr_Brush_Draw(heightmap_t *hm, batch_t **batches, entity_t *e)
 {
 	batch_t *b;
@@ -6401,7 +6428,7 @@ static brushes_t *Terr_Brush_Insert(model_t *model, heightmap_t *hm, brushes_t *
 		do
 		{
 			out->id = (++hm->brushidseq)&0x00ffffff;
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 			if (cls.state)	//avoid networking conflicts by having each node generating its own private ids
 				out->id |= (cl.playerview[0].playernum+1)<<24;
 #endif
@@ -6687,7 +6714,7 @@ static qboolean Brush_Deserialise(heightmap_t *hm, brushes_t *br, void *mem)
 }
 
 
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 heightmap_t	*CL_BrushEdit_ForceContext(model_t *mod)
 {
 	heightmap_t *hm = mod?mod->terrain:NULL;
@@ -6719,10 +6746,10 @@ void CL_Parse_BrushEdit(void)
 	model_t			*mod			= (modelindex<countof(cl.model_precache))?cl.model_precache[modelindex]:NULL;
 	heightmap_t		*hm				= mod?mod->terrain:NULL;
 
-#ifdef CLIENTONLY
-	const qboolean		ignore = false;
-#else
+#ifdef HAVE_SERVER
 	const qboolean		ignore = (sv_state>=ss_loading);	//if we're the server then we already have this info. don't break anything (this info is present for demos).
+#else
+	const qboolean		ignore = false;
 #endif
 
 	if (cmd == hmcmd_brush_delete)
@@ -6828,7 +6855,7 @@ void CL_Parse_BrushEdit(void)
 		Host_EndGame("CL_Parse_BrushEdit: unknown command %i\n", cmd);
 }
 #endif
-#ifndef CLIENTONLY
+#ifdef HAVE_SERVER
 qboolean SV_Prespawn_Brushes(sizebuf_t *msg, unsigned int *modelindex, unsigned int *lastid)
 {
 	//lastid starts at 0
@@ -7268,7 +7295,7 @@ void QCBUILTIN PF_brush_create(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 	//if we're creating one that already exists, then assume that its a move.
 	if (brushid && Terr_Brush_DeleteId(hm, brushid))
 	{
-#ifndef CLIENTONLY
+#ifdef HAVE_SERVER
 		if (sv.state && modelindex > 0)
 		{
 			MSG_WriteByte(&sv.multicast, svcfte_brushedit);
@@ -7279,7 +7306,7 @@ void QCBUILTIN PF_brush_create(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 		}
 		else
 #endif
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 		if (cls.state && modelindex > 0)
 		{
 			MSG_WriteByte(&cls.netchan.message, clcfte_brushedit);
@@ -7306,6 +7333,10 @@ void QCBUILTIN PF_brush_create(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 		faces[i].stdir[0][3] = in_faces[i].sbias;
 		VectorCopy(in_faces[i].tdir, faces[i].stdir[1]);
 		faces[i].stdir[1][3] = in_faces[i].tbias;
+
+		//these are for compat with (q2/)q3 so as to not be lossy even if they're not really used.
+		faces[i].surfaceflags = 0;
+		faces[i].surfacevalue = 0;
 	}
 
 	//now emit it
@@ -7321,7 +7352,7 @@ void QCBUILTIN PF_brush_create(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 		if (nb)
 		{
 			G_INT(OFS_RETURN) = nb->id;
-#ifndef CLIENTONLY
+#ifdef HAVE_SERVER
 			if (sv.state && modelindex > 0)
 			{
 				MSG_WriteByte(&sv.multicast, svcfte_brushedit);
@@ -7332,7 +7363,7 @@ void QCBUILTIN PF_brush_create(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 				return;
 			}
 #endif
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 			if (cls.state && modelindex > 0)
 			{
 				MSG_WriteByte(&cls.netchan.message, clcfte_brushedit);
@@ -7383,7 +7414,7 @@ void QCBUILTIN PF_patch_create(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 	//if we're creating one that already exists, then assume that its a move.
 	if (brushid && Terr_Brush_DeleteId(hm, brushid))
 	{
-#ifndef CLIENTONLY
+#ifdef HAVE_SERVER
 		if (sv.state && modelindex > 0)
 		{
 			MSG_WriteByte(&sv.multicast, svcfte_brushedit);
@@ -7394,7 +7425,7 @@ void QCBUILTIN PF_patch_create(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 		}
 		else
 #endif
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 		if (cls.state && modelindex > 0)
 		{
 			MSG_WriteByte(&cls.netchan.message, clcfte_brushedit);
@@ -7435,7 +7466,7 @@ void QCBUILTIN PF_patch_create(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 		if (nb)
 		{
 			G_INT(OFS_RETURN) = nb->id;
-#ifndef CLIENTONLY
+#ifdef HAVE_SERVER
 			if (sv.state && modelindex > 0)
 			{
 				MSG_WriteByte(&sv.multicast, svcfte_brushedit);
@@ -7446,7 +7477,7 @@ void QCBUILTIN PF_patch_create(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 				return;
 			}
 #endif
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 			if (cls.state && modelindex > 0)
 			{
 				MSG_WriteByte(&cls.netchan.message, clcfte_brushedit);
@@ -7473,7 +7504,7 @@ void QCBUILTIN PF_brush_delete(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 
 	Terr_Brush_DeleteId(hm, brushid);
 
-#ifndef CLIENTONLY
+#ifdef HAVE_SERVER
 	if (sv.state && modelindex > 0)
 	{
 		MSG_WriteByte(&sv.multicast, svcfte_brushedit);
@@ -7484,7 +7515,7 @@ void QCBUILTIN PF_brush_delete(pubprogfuncs_t *prinst, struct globalvars_s *pr_g
 		return;
 	}
 #endif
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	if (cls.state && modelindex > 0)
 	{
 		MSG_WriteByte(&cls.netchan.message, clcfte_brushedit);
@@ -7919,7 +7950,8 @@ void Terr_WriteMapFile(vfsfile_t *file, model_t *mod)
 			else
 				entities = COM_ParseOut(entities, token, sizeof(token));
 		}
-		VFS_WRITE(file, start, entities - start);
+		if (entities)
+			VFS_WRITE(file, start, entities - start);
 		start = entities;
 	}
 }
@@ -7936,7 +7968,7 @@ void Mod_Terrain_Save_f(void)
 	}
 	if (*mapname)
 		mod = Mod_FindName(va("maps/%s", mapname));
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	else if (cls.state)
 		mod = cl.worldmodel;
 #endif
@@ -8030,7 +8062,16 @@ qboolean Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
 	{
 		start = entities;
 		entities = COM_ParseTokenOut(entities, brushpunct, token, sizeof(token), NULL);
-		if (token[0] == '}' && token[1] == 0)
+		if (!entities)
+		{
+			if (inbrush || nest)
+			{
+				Con_Printf(CON_ERROR "%s: File truncated?\n", mod->name);
+				return false;
+			}
+			break;
+		}
+		else if (token[0] == '}' && token[1] == 0)
 		{
 			nest--;
 			if (inbrush)
@@ -8076,6 +8117,7 @@ qboolean Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
 					if (submodelnum)
 					{
 						Q_snprintfz(token, sizeof(token), "*%i", submodelnum);
+						*out++ = '\n';
 						*out++ = 'm';
 						*out++ = 'o';
 						*out++ = 'd';
@@ -8108,7 +8150,7 @@ qboolean Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
 							submod->funcs.MarkLights			= Heightmap_MarkLights;
 							submod->funcs.ClusterForPoint		= Heightmap_ClusterForPoint;
 							submod->funcs.ClusterPVS			= Heightmap_ClusterPVS;
-#ifndef CLIENTONLY
+#ifdef HAVE_SERVER
 							submod->funcs.FindTouchedLeafs		= Heightmap_FindTouchedLeafs;
 							submod->funcs.EdictInFatPVS			= Heightmap_EdictInFatPVS;
 							submod->funcs.FatPVS				= Heightmap_FatPVS;
@@ -8117,7 +8159,8 @@ qboolean Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
 							submod->pvsbytes = sizeof(hmpvs_t);
 
 #ifdef RUNTIMELIGHTING
-							subhm->relightcontext = LightStartup(hm->relightcontext, submod, false, false);
+							if (hm->relightcontext)
+								subhm->relightcontext = LightStartup(hm->relightcontext, submod, false, false);
 							subhm->lightthreadmem = hm->lightthreadmem;
 							subhm->inheritedlightthreadmem = true;
 #endif
@@ -8136,6 +8179,11 @@ qboolean Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
 				continue;
 			}
 		}
+		else if (!nest)
+		{
+			Con_Printf(CON_ERROR "%s: junk found\n", mod->name);
+			return false;
+		}
 		else if (inbrush && (!strcmp(token, "patchDef2")   || !strcmp(token, "patchDef3") ||
 							 !strcmp(token, "patchDef2WS") || !strcmp(token, "patchDef3WS")))
 		{
@@ -8247,11 +8295,11 @@ qboolean Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
 			//Quake:             ( -0 -0 16 ) ( -0 -0 32 ) ( 64 -0 16 )                         texname soffset toffset     rotation sscale tscale
 			//Hexen2:            ( -0 -0 16 ) ( -0 -0 32 ) ( 64 -0 16 )                         texname soffset toffset     rotation sscale tscale surfvalue
 			//Valve:             ( -0 -0 16 ) ( -0 -0 32 ) ( 64 -0 16 )                         texname [x y z d] [x y z d] rotation sscale tscale
-			//FTE  :             ( px py pz pd )                                                texname [x y z d] [x y z d] rotation sscale tscale
+			//FTE  :             ( px py pz pd )                                                texname [x y z d] [x y z d] rotation sscale tscale contents surfflags surfvalue
 			//Quake2:            ( -0 -0 16 ) ( -0 -0 32 ) ( 64 -0 16 )                         texname soffset toffset     rotation sscale tscale contents surfflags surfvalue
-			//Quake3:            ( -0 -0 16 ) ( -0 -0 32 ) ( 64 -0 16 )                         texname soffset toffset     rotation sscale tscale contents surfflags surfvalue
-			//Q3 BP: brushDef {  ( -0 -0 16 ) ( -0 -0 32 ) ( 64 -0 16 ) ( ( x y o ) ( x y o ) ) texname                                            contents surfflags surfvalue } //generate tangent+bitangent from the normal to generate base texcoords, then transform by the given 2*3 matrix. I prefer valve's way - it rotates more cleanly.
-			//Doom3: brushDef3 { ( px py pz pd )                        ( ( x y o ) ( x y o ) ) texname                                            contents surfflags surfvalue }
+			//Quake3:            ( -0 -0 16 ) ( -0 -0 32 ) ( 64 -0 16 )                         texname soffset toffset     rotation sscale tscale detailfl surfflags surfvalue
+			//Q3 BP: brushDef {  ( -0 -0 16 ) ( -0 -0 32 ) ( 64 -0 16 ) ( ( x y o ) ( x y o ) ) texname                                            detailfl surfflags surfvalue } //generate tangent+bitangent from the normal to generate base texcoords, then transform by the given 2*3 matrix. I prefer valve's way - it rotates more cleanly.
+			//Doom3: brushDef3 { ( px py pz pd )                        ( ( x y o ) ( x y o ) ) texname                                            detailfl surfflags surfvalue }
 			//hexen2's extra surfvalue is completely unused, and should normally be -1
 			//q3 ignores all contents except detail, as well surfaceflags and surfacevalue
 			//220 ignores rotation, provided only for UI info, scale is still used
@@ -8346,25 +8394,6 @@ qboolean Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
 			}
 
 			bt = Terr_Brush_FindTexture(subhm, token);
-			if (*token == '*')
-			{
-				if (!Q_strncasecmp(token, "*lava", 5))
-					brushcontents = FTECONTENTS_LAVA;
-				else if (!Q_strncasecmp(token, "*slime", 5))
-					brushcontents = FTECONTENTS_SLIME;
-				else
-					brushcontents = FTECONTENTS_WATER;
-			}
-			else if (!Q_strncasecmp(token, "*sky", 4))
-				brushcontents = FTECONTENTS_SKY;
-			else if (!Q_strcasecmp(token, "clip"))
-				brushcontents = FTECONTENTS_PLAYERCLIP|FTECONTENTS_MONSTERCLIP;
-			else if (!Q_strcasecmp(token, "hint"))
-				brushcontents = 0;
-			else if (!Q_strcasecmp(token, "skip"))
-				;//brushcontents = 0;
-			else
-				brushcontents = FTECONTENTS_SOLID;
 
 			if (textype != TEXTYPE_BP)
 			{
@@ -8424,6 +8453,7 @@ qboolean Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
 			//The contents conveys only CONTENTS_DETAIL. which is awkward as it varies somewhat by game, but we assume q2/q3.
 			faces[numplanes].surfaceflags = 0;
 			faces[numplanes].surfacevalue = 0;
+
 			while (*entities == ' ' || *entities == '\t')
 				entities++;
 			if (*entities == '-' || (*entities >= '0' && *entities <= '9'))
@@ -8448,10 +8478,8 @@ qboolean Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
 					ex3 = atoi(token);
 					//if we got this far, then its q3 format.
 					//q3 is weird. the first extra arg is contents. but only the detail contents is used.
-					if (ex1 & Q3CONTENTS_DETAIL)
-					{
-						brushcontents |= Q3CONTENTS_DETAIL;
-					}
+					//ex1 &= Q3CONTENTS_DETAIL;
+					brushcontents |= ex1;
 
 					//propagate these, in case someone tries editing a q2bsp.
 					faces[numplanes].surfaceflags = ex2;
@@ -8475,6 +8503,39 @@ qboolean Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
 			}
 			faces[numplanes].tex = bt;
 
+			/*
+			shader_t *shader = R_RegisterCustom(NULL, bt->shadername, SUF_LIGHTMAP, NULL, NULL);
+			if (shader)
+			{
+				brushcontents &= Q3CONTENTS_DETAIL;
+				brushcontents |= shader->contentbits&~Q3CONTENTS_DETAIL;
+				faces[numplanes].surfaceflags = shader->surfacebits;
+			}
+			else
+			*/
+			if (bt && !numplanes)
+			{
+				if (*bt->shadername == '*')
+				{
+					if (!Q_strncasecmp(bt->shadername, "*lava", 5))
+						brushcontents |= FTECONTENTS_LAVA;
+					else if (!Q_strncasecmp(bt->shadername, "*slime", 5))
+						brushcontents |= FTECONTENTS_SLIME;
+					else
+						brushcontents |= FTECONTENTS_WATER;
+				}
+				else if (!Q_strncasecmp(bt->shadername, "*sky", 4))
+					brushcontents |= FTECONTENTS_SKY;
+				else if (!Q_strcasecmp(bt->shadername, "clip"))
+					brushcontents |= FTECONTENTS_PLAYERCLIP|FTECONTENTS_MONSTERCLIP;
+				else if (!Q_strcasecmp(bt->shadername, "hint"))
+					brushcontents |= 0;
+				else if (!Q_strcasecmp(bt->shadername, "skip"))	//skip should not force content values if paired with lava etc.
+					;//brushcontents = 0;
+				else
+					brushcontents |= FTECONTENTS_SOLID;
+			}
+
 			if (textype == TEXTYPE_BP)
 			{
 				float *norm = planes[numplanes];
@@ -8540,9 +8601,9 @@ qboolean Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
 		}
 		else
 		{
-			if (!strcmp(token, "classname"))
+			/*if (!strcmp(token, "classname"))
 				entities = COM_ParseTokenOut(entities, brushpunct, token, sizeof(token), NULL);
-			else
+			else*/
 				entities = COM_ParseTokenOut(entities, brushpunct, token, sizeof(token), NULL);
 		}
 		while(start < entities)
@@ -8642,7 +8703,7 @@ qboolean QDECL Terr_LoadTerrainModel (model_t *mod, void *buffer, size_t bufsize
 	mod->funcs.ClusterForPoint		= Heightmap_ClusterForPoint;
 	mod->funcs.ClusterPVS			= Heightmap_ClusterPVS;
 
-#ifndef CLIENTONLY
+#ifdef HAVE_SERVER
 	mod->funcs.FindTouchedLeafs		= Heightmap_FindTouchedLeafs;
 	mod->funcs.EdictInFatPVS		= Heightmap_EdictInFatPVS;
 	mod->funcs.FatPVS				= Heightmap_FatPVS;
@@ -8725,7 +8786,7 @@ void *Mod_LoadTerrainInfo(model_t *mod, char *loadname, qboolean force)
 	return hm;
 }
 
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 #if 0 //not yet ready
 struct ted_import_s
 {
@@ -9020,7 +9081,7 @@ void Mod_Terrain_Create_f(void)
 //reads in the terrain a tile at a time, and writes it out again.
 //the new version will match our current format version.
 //this is mostly so I can strip out old format revisions...
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 void Mod_Terrain_Convert_f(void)
 {
 	model_t *mod;
@@ -9097,7 +9158,7 @@ void Mod_Terrain_Reload_f(void)
 	heightmap_t *hm;
 	if (Cmd_Argc() >= 2)
 		mod = Mod_FindName(va("maps/%s.hmp", Cmd_Argv(1)));
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 	else if (cls.state)
 		mod = cl.worldmodel;
 #endif
@@ -9131,10 +9192,10 @@ plugterrainfuncs_t *Terr_GetTerrainFuncs(size_t structsize)
 {
 	if (structsize != sizeof(plugterrainfuncs_t))
 		return NULL;
-#ifdef SERVERONLY
-	return NULL;	//dedicated server builds have all the visual stuff stripped, which makes APIs too inconsistent. Generate then save. Or fix up the API...
-#else
+#ifdef HAVE_CLIENT
 	return &terrainfuncs;
+#else
+	return NULL;	//dedicated server builds have all the visual stuff stripped, which makes APIs too inconsistent. Generate then save. Or fix up the API...
 #endif
 }
 
@@ -9153,7 +9214,7 @@ void Terr_Init(void)
 	Cvar_Register(&mod_terrain_savever, "Terrain");
 	Cmd_AddCommand("mod_terrain_save", Mod_Terrain_Save_f);
 	Cmd_AddCommand("mod_terrain_reload", Mod_Terrain_Reload_f);
-#ifndef SERVERONLY
+#ifdef HAVE_CLIENT
 //	Cmd_AddCommandD("mod_terrain_export", Mod_Terrain_Export_f, "Export a raw heightmap");
 //	Cmd_AddCommandD("mod_terrain_import", Mod_Terrain_Import_f, "Import a raw heightmap");
 	Cmd_AddCommand("mod_terrain_create", Mod_Terrain_Create_f);
diff --git a/engine/gl/gl_model.c b/engine/gl/gl_model.c
index 32e119e08..8a1e7b97f 100644
--- a/engine/gl/gl_model.c
+++ b/engine/gl/gl_model.c
@@ -222,6 +222,8 @@ static void Mod_TextureList_f(void)
 					char *cr;
 					while ((cr = strchr(body, '\r')))
 						*cr = ' ';
+					if (strlen(body) > 3000)
+						body[3000] = 0;	//arbitrary cut off, to avoid console glitches with big shaders.
 				}
 
 				if (preview)
@@ -634,10 +636,7 @@ void Mod_SetModifier(const char *modifier)
 }
 
 #ifndef SERVERONLY
-void Mod_FindCubemaps_f(void);
-void Mod_Realign_f(void);
-void Mod_BSPX_List_f(void);
-void Mod_BSPX_Strip_f(void);
+void Mod_BSPX_Init(void);
 #endif
 
 /*
@@ -689,10 +688,7 @@ void Mod_Init (qboolean initial)
 		Cvar_Register (&r_sprite_backfacing, NULL);
 #endif
 #ifndef SERVERONLY
-		Cmd_AddCommandD("mod_findcubemaps", Mod_FindCubemaps_f, "Scans the entities of a map to find reflection env_cubemap sites and determines the nearest one to each surface.");
-		Cmd_AddCommandD("mod_realign", Mod_Realign_f, "Reads the named bsp and writes it back out with only alignment changes.");
-		Cmd_AddCommandD("mod_bspx_list", Mod_BSPX_List_f, "Lists all lumps (and their sizes) in the specified bsp.");
-		Cmd_AddCommandD("mod_bspx_strip", Mod_BSPX_Strip_f, "Strips a named extension lump from a bsp file.");
+		Mod_BSPX_Init();
 #endif
 	}
 
@@ -1629,7 +1625,7 @@ void Mod_LoadLighting (model_t *loadmodel, bspx_header_t *bspx, qbyte *mod_base,
 	qbyte *litdata = NULL; //xyz8
 	qbyte *lumdata = NULL; //l8
 	qbyte *out;
-	unsigned int samples;
+	size_t samples;
 #ifdef RUNTIMELIGHTING
 	qboolean relighting = false;
 #endif
@@ -1851,7 +1847,7 @@ void Mod_LoadLighting (model_t *loadmodel, bspx_header_t *bspx, qbyte *mod_base,
 		exptmp = littmp = false;
 		if (!litdata && !expdata)
 		{
-			int size;
+			size_t size;
 			/*FIXME: bspx support for extents+lmscale, may require style+offset lumps too, not sure what to do here*/
 			expdata = BSPX_FindLump(bspx, mod_base, "LIGHTING_E5BGR9", &size);
 			exptmp = true;
@@ -1943,7 +1939,7 @@ void Mod_LoadLighting (model_t *loadmodel, bspx_header_t *bspx, qbyte *mod_base,
 		}
 		if (!luxdata)
 		{
-			int size;
+			size_t size;
 			luxdata = BSPX_FindLump(bspx, mod_base, "LIGHTINGDIR", &size);
 			if (size != samples*3)
 				luxdata = NULL;
@@ -2038,28 +2034,28 @@ void Mod_LoadLighting (model_t *loadmodel, bspx_header_t *bspx, qbyte *mod_base,
 
 	if (overrides && !overrides->shifts)
 	{
-		int size;
+		size_t size;
 		//if we have shifts, then we probably also have legacy data in the surfaces that we want to override
 		if (!overrides->offsets)
 		{
-			int size;
+			size_t size;
 			overrides->offsets = BSPX_FindLump(bspx, mod_base, "LMOFFSET", &size);
 			if (size != loadmodel->numsurfaces * sizeof(int))
 			{
 				if (size)
-					Con_Printf(CON_ERROR"BSPX LMOFFSET lump is wrong size, expected %u entries, found %u\n", loadmodel->numsurfaces, size/(unsigned int)sizeof(int));
+					Con_Printf(CON_ERROR"BSPX LMOFFSET lump is wrong size, expected %u entries, found %"PRIuSIZE"\n", loadmodel->numsurfaces, size/(unsigned int)sizeof(int));
 				overrides->offsets = NULL;
 			}
 		}
 		if (!overrides->styles8 && !overrides->styles16)
 		{	//16bit per-face lightmap styles index
-			int size;
+			size_t size;
 			overrides->styles16 = BSPX_FindLump(bspx, mod_base, "LMSTYLE16", &size);
 			overrides->stylesperface = size / (sizeof(*overrides->styles16)*loadmodel->numsurfaces); //rounding issues will be caught on the next line...
 			if (!overrides->stylesperface || size != loadmodel->numsurfaces * sizeof(*overrides->styles16)*overrides->stylesperface)
 			{
 				if (size)
-					Con_Printf(CON_ERROR"BSPX LMSTYLE16 lump is wrong size, expected %u*%u entries, found %u\n", loadmodel->numsurfaces, overrides->stylesperface, size/(unsigned int)sizeof(*overrides->styles16));
+					Con_Printf(CON_ERROR"BSPX LMSTYLE16 lump is wrong size, expected %u*%u entries, found %"PRIuSIZE"\n", loadmodel->numsurfaces, overrides->stylesperface, size/(unsigned int)sizeof(*overrides->styles16));
 				overrides->styles16 = NULL;
 			}
 			else if (overrides->stylesperface > MAXCPULIGHTMAPS)
@@ -2067,13 +2063,13 @@ void Mod_LoadLighting (model_t *loadmodel, bspx_header_t *bspx, qbyte *mod_base,
 		}
 		if (!overrides->styles8 && !overrides->styles16)
 		{	//16bit per-face lightmap styles index
-			int size;
+			size_t size;
 			overrides->styles8 = BSPX_FindLump(bspx, mod_base, "LMSTYLE", &size);
 			overrides->stylesperface = size / (sizeof(*overrides->styles8)*loadmodel->numsurfaces); //rounding issues will be caught on the next line...
 			if (!overrides->stylesperface || size != loadmodel->numsurfaces * sizeof(*overrides->styles8)*overrides->stylesperface)
 			{
 				if (size)
-					Con_Printf(CON_ERROR"BSPX LMSTYLE16 lump is wrong size, expected %u*%u entries, found %u\n", loadmodel->numsurfaces, overrides->stylesperface, size/(unsigned int)sizeof(*overrides->styles8));
+					Con_Printf(CON_ERROR"BSPX LMSTYLE16 lump is wrong size, expected %u*%u entries, found %"PRIuSIZE"\n", loadmodel->numsurfaces, overrides->stylesperface, size/(unsigned int)sizeof(*overrides->styles8));
 				overrides->styles8 = NULL;
 			}
 			else if (overrides->stylesperface > MAXCPULIGHTMAPS)
@@ -2085,7 +2081,7 @@ void Mod_LoadLighting (model_t *loadmodel, bspx_header_t *bspx, qbyte *mod_base,
 		{
 			if (size)
 			{	//ericw-tools is screwing up again. don't leave things screwed.
-				Con_Printf(CON_ERROR"BSPX LMSHIFT lump is wrong size, expected %u entries, found %u\n", loadmodel->numsurfaces, size);
+				Con_Printf(CON_ERROR"BSPX LMSHIFT lump is wrong size, expected %u entries, found %"PRIuSIZE"\n", loadmodel->numsurfaces, size);
 				overrides->styles16 = NULL;
 				overrides->styles8 = NULL;
 				overrides->offsets = NULL;
@@ -2290,7 +2286,7 @@ static void Mod_SaveEntFile_f(void)
 
 	if (COM_WriteFile(fname, FS_GAMEONLY, ents, strlen(ents)))
 	{
-		if (FS_NativePath(fname, FS_GAMEONLY, nname, sizeof(nname)))
+		if (FS_DisplayPath(fname, FS_GAMEONLY, nname, sizeof(nname)))
 			Con_Printf("Wrote %s\n", nname);
 	}
 	else
@@ -2425,7 +2421,7 @@ qboolean Mod_LoadVertexNormals (model_t *loadmodel, bspx_header_t *bspx, qbyte *
 {
 	float	*in;
 	float	*out;
-	int			i, count;
+	size_t	i, count;
 
 	if (l)
 	{
@@ -2442,7 +2438,7 @@ qboolean Mod_LoadVertexNormals (model_t *loadmodel, bspx_header_t *bspx, qbyte *
 	}
 	else
 	{	//ericw's thing
-		unsigned int size;
+		size_t size;
 		quint32_t t;
 		int *normcount;
 		struct surfedgenormals_s *sen;
@@ -3687,7 +3683,7 @@ static void Mod_LoadMiptex(model_t *loadmodel, texture_t *tx, miptex_t *mt, int
 			}
 			if (extsize != 16+sz)
 			{
-				Con_Printf("miptex %s has incomplete mipchain\n", Image_FormatName(newfmt));
+				Con_Printf(CON_WARNING"miptex %s (%s) has incomplete mipchain\n", tx->name, Image_FormatName(newfmt));
 				continue;
 			}
 
@@ -3767,7 +3763,7 @@ static void Mod_LoadMiptex(model_t *loadmodel, texture_t *tx, miptex_t *mt, int
 	legacysize = 0;
 	for (m = 0; m < 4; m++)
 	{
-		if (mt->offsets[m])
+		if (mt->offsets[m] && (mt->offsets[m]+(mt->width>>m)*(mt->height>>m)<=miptexsize))
 			memcpy(tx->srcdata+legacysize, ptr + mt->offsets[m], (mt->width>>m)*(mt->height>>m));
 		else
 			memset(tx->srcdata+legacysize, 0, (mt->width>>m)*(mt->height>>m));
@@ -3837,6 +3833,7 @@ TRACE(("dbg: Mod_LoadTextures: inittexturedescs\n"));
 		o = LittleLong(m->dataofs[i]);
 		if (o >= l->filelen)	//e1m2, this happens
 		{
+badmip:
 			tx = ZG_Malloc(&loadmodel->memgroup, sizeof(texture_t));
 			memcpy(tx, r_notexture_mip, sizeof(texture_t));
 			sprintf(tx->name, "unnamed%i", i);
@@ -3870,6 +3867,12 @@ TRACE(("dbg: Mod_LoadTextures: inittexturedescs\n"));
 
 		TRACE(("dbg: Mod_LoadTextures: texture %s\n", mt->name));
 
+		if (mt->offsets[0] && (mt->width > 0xffff|| mt->height > 0xffff))
+		{
+			Con_Printf(CON_WARNING "%s: miptex %i is excessively large. probably corrupt\n", loadmodel->name, i);
+			goto badmip;
+		}
+
 		if (!*mt->name)	//I HATE MAPPERS!
 		{
 			Q_snprintfz(mt->name, sizeof(mt->name), "unnamed%i", i);
@@ -4269,7 +4272,7 @@ static qboolean Mod_LoadFaces (model_t *loadmodel, bspx_header_t *bspx, qbyte *m
 	qboolean lightmapusable = false;
 
 	struct decoupled_lm_info_s *decoupledlm;
-	unsigned int dcsize;
+	size_t dcsize;
 
 	memset(&overrides, 0, sizeof(overrides));
 
@@ -4406,8 +4409,20 @@ static qboolean Mod_LoadFaces (model_t *loadmodel, bspx_header_t *bspx, qbyte *m
 			lofs = LittleLong(decoupledlm->lmoffset);
 			out->texturemins[0] = out->texturemins[1] = 0; // should be handled by the now-per-surface vecs[][3] value.
 			out->lmshift = 0;	//redundant.
-			out->extents[0] = (unsigned short)LittleShort(decoupledlm->lmsize[0]) - 1;
-			out->extents[1] = (unsigned short)LittleShort(decoupledlm->lmsize[1]) - 1;
+			if (!decoupledlm->lmsize[0] || !decoupledlm->lmsize[1])
+			{
+				decoupledlm->lmsize[0] = decoupledlm->lmsize[1] = 0;
+				if (lofs != (unsigned int)-1)
+				{	//we'll silently allow these buggy surfaces for now... but only if they've got no lightmap data at all. unsafe if they're the last otherwise.
+					lofs = -1;
+					Con_Printf(CON_WARNING"%s: Face %i has invalid extents\n", loadmodel->name, surfnum);
+				}
+			}
+			else
+			{
+				out->extents[0] = (unsigned short)LittleShort(decoupledlm->lmsize[0]) - 1;	//surfaces should NEVER have an extent of 0. even if the surface is omitted it should still have some padding...
+				out->extents[1] = (unsigned short)LittleShort(decoupledlm->lmsize[1]) - 1;
+			}
 			loadmodel->facelmvecs[surfnum].lmvecs[0][0] = LittleFloat(decoupledlm->lmvecs[0][0]);
 			loadmodel->facelmvecs[surfnum].lmvecs[0][1] = LittleFloat(decoupledlm->lmvecs[0][1]);
 			loadmodel->facelmvecs[surfnum].lmvecs[0][2] = LittleFloat(decoupledlm->lmvecs[0][2]);
diff --git a/engine/gl/gl_model.h b/engine/gl/gl_model.h
index c5635d49d..77a555bf7 100644
--- a/engine/gl/gl_model.h
+++ b/engine/gl/gl_model.h
@@ -209,9 +209,11 @@ m*_t structures are in-memory
 #define	QWEF_FLAG1	 			(1<<4)	//only applies to qw player entities
 #define	NQEF_NODRAW				(1<<4)	//so packet entities are free to get this instead
 #define REEF_QUADLIGHT			(1<<4)
+#define TENEBRAEEF_FULLDYNAMIC	(1<<4)
 #define	QWEF_FLAG2	 			(1<<5)	//only applies to qw player entities
 #define	NQEF_ADDITIVE			(1<<5)	//so packet entities are free to get this instead
 #define REEF_PENTLIGHT			(1<<5)
+#define TENEBRAEEF_GREEN		(1<<5)
 #define	EF_BLUE					(1<<6)
 #define REEF_CANDLELIGHT		(1<<6)
 #define	EF_RED					(1<<7)
@@ -602,7 +604,7 @@ void Q1BSP_GenerateShadowMesh(struct model_s *model, struct dlight_s *dl, const
 
 void BSPX_LightGridLoad(struct model_s *model, bspx_header_t *bspx, qbyte *mod_base);	//for q1 or q2 models.
 void BSPX_LoadEnvmaps(struct model_s *mod, bspx_header_t *bspx, void *mod_base);
-void *BSPX_FindLump(bspx_header_t *bspxheader, void *mod_base, char *lumpname, int *lumpsize);
+void *BSPX_FindLump(bspx_header_t *bspxheader, void *mod_base, char *lumpname, size_t *lumpsize);
 bspx_header_t *BSPX_Setup(struct model_s *mod, char *filebase, size_t filelen, lump_t *lumps, size_t numlumps);
 
 typedef struct fragmentdecal_s fragmentdecal_t;
@@ -1107,8 +1109,9 @@ typedef struct model_s
 			//internally, we still use integers for lighting, with .7 bits of extra precision.
 			LM_L8,
 			LM_RGB8,
-			LM_E5BGR9
+			LM_E5BGR9,
 		} fmt;
+		enum uploadfmt prebaked;
 		qboolean deluxemapping;	//lightmaps are interleaved with deluxemap data (lightmap indicies should only be even values)
 		qboolean deluxemapping_modelspace; //deluxemaps are in modelspace - we need different glsl.
 	} lightmaps;
@@ -1180,6 +1183,7 @@ unsigned int Heightmap_PointContents(model_t *model, const vec3_t axis[3], const
 struct fragmentdecal_s;
 void Terrain_ClipDecal(struct fragmentdecal_s *dec, float *center, float radius, model_t *model);
 qboolean Terr_DownloadedSection(char *fname);
+shader_t *Terr_GetShader(struct model_s *mod, struct trace_s *trace);
 
 void CL_Parse_BrushEdit(void);
 qboolean SV_Parse_BrushEdit(void);
diff --git a/engine/gl/gl_ngraph.c b/engine/gl/gl_ngraph.c
index 622bc3200..c58ea824e 100644
--- a/engine/gl/gl_ngraph.c
+++ b/engine/gl/gl_ngraph.c
@@ -244,7 +244,10 @@ void R_FrameTimeGraph (float frametime, float scale)
 #ifdef LOADERTHREAD
 	extern int com_hadwork[WG_COUNT];
 #endif
-	extern double server_frametime, r_loaderstalltime;
+	extern double r_loaderstalltime;
+#ifdef HAVE_SERVER
+	extern double server_frametime;
+#endif
 
 	history[findex&NET_TIMINGSMASK].time[0] = max(0,frametime);	//server band
 #ifdef HAVE_SERVER
diff --git a/engine/gl/gl_rlight.c b/engine/gl/gl_rlight.c
index d8ec8d1fc..bd9513879 100644
--- a/engine/gl/gl_rlight.c
+++ b/engine/gl/gl_rlight.c
@@ -1461,7 +1461,7 @@ static void R_SaveRTLights_f(void)
 	vfsfile_t *f;
 	unsigned int i;
 	char fname[MAX_QPATH];
-	char sysname[MAX_OSPATH];
+	char displayname[MAX_OSPATH];
 	vec3_t ang;
 	int ver = 0;
 	COM_StripExtension(cl.worldmodel->name, fname, sizeof(fname));
@@ -1531,8 +1531,8 @@ static void R_SaveRTLights_f(void)
 	}
 	VFS_CLOSE(f);
 
-	FS_NativePath(fname, FS_GAMEONLY, sysname, sizeof(sysname));
-	Con_Printf("rtlights saved to %s\n", sysname);
+	FS_DisplayPath(fname, FS_GAMEONLY, displayname, sizeof(displayname));
+	Con_Printf("rtlights saved to %s\n", displayname);
 }
 
 void R_StaticEntityToRTLight(int i)
@@ -2762,7 +2762,7 @@ static float *GLRecursiveLightPoint3C (model_t *mod, mnode_t *node, const vec3_t
 		t = DotProduct (mid, lmvecs[1]) + lmvecs[1][3];
 
 		if (s < surf->texturemins[0] ||
-		t < surf->texturemins[1])
+			t < surf->texturemins[1])
 			continue;
 
 		ds = s - surf->texturemins[0];
@@ -2948,17 +2948,15 @@ typedef struct
 	{
 		int mins[3];
 		int size[3];
+		unsigned char numstyles;
 		struct bspxlgsamp_s
 		{
-			struct
-			{
-				qbyte style;
-				qbyte rgb[3];
-			} map[4];
-		} *rgbvalues;
+			qbyte style;
+			qbyte rgb[3];
+		} *rgbvalues;	//size[x*y*z]*numstyles
 	} *leafs;
 } bspxlightgrid_t;
-struct rctx_s {qbyte *data; int ofs, size;};
+struct rctx_s {qbyte *data; size_t ofs, size;};
 static qbyte ReadByte(struct rctx_s *ctx)
 {
 	if (ctx->ofs >= ctx->size)
@@ -3011,23 +3009,27 @@ void BSPX_LightGridLoad(model_t *model, bspx_header_t *bspx, qbyte *mod_base)
 	numleafs = ReadInt(&ctx);
 	for (i = 0; i < numleafs; i++)
 	{
+		unsigned int ms = 1;
 		unsigned int lsz[3];
 		ctx.ofs += 3*4;
 		for (j = 0; j < 3; j++)
 			lsz[j] = ReadInt(&ctx);
 		j = lsz[0]*lsz[1]*lsz[2];
-		leafsamps += j;
 		while (j --> 0)
 		{	//this loop is annonying, memcpy dreams...
 			s = ReadByte(&ctx);
 			if (s == 255)
 				continue;
+			if (ms < s)
+				ms = s;
 			ctx.ofs += s*4;
 		}
+		j = lsz[0]*lsz[1]*lsz[2];
+		leafsamps += j*ms;
 	}
 
 	grid = ZG_Malloc(&model->memgroup, sizeof(*grid) + sizeof(*grid->leafs)*numleafs + sizeof(*grid->nodes)*numnodes + sizeof(struct bspxlgsamp_s)*leafsamps);
-	memset(grid, 0xcc, sizeof(*grid) + sizeof(*grid->leafs)*numleafs + sizeof(*grid->nodes)*numnodes + sizeof(struct bspxlgsamp_s)*leafsamps);
+//	memset(grid, 0xcc, sizeof(*grid) + sizeof(*grid->leafs)*numleafs + sizeof(*grid->nodes)*numnodes + sizeof(struct bspxlgsamp_s)*leafsamps);
 	grid->leafs = (void*)(grid+1);
 	grid->nodes = (void*)(grid->leafs + numleafs);
 	samp = (void*)(grid->nodes+numnodes);
@@ -3053,6 +3055,8 @@ void BSPX_LightGridLoad(model_t *model, bspx_header_t *bspx, qbyte *mod_base)
 	ctx.ofs += 4;
 	for (i = 0; i < numleafs; i++)
 	{
+		unsigned int leafdataofs;
+		unsigned int ms = 1;
 		for (j = 0; j < 3; j++)
 			grid->leafs[i].mins[j] = ReadInt(&ctx);
 		for (j = 0; j < 3; j++)
@@ -3061,6 +3065,21 @@ void BSPX_LightGridLoad(model_t *model, bspx_header_t *bspx, qbyte *mod_base)
 		grid->leafs[i].rgbvalues = samp;
 
 		j = grid->leafs[i].size[0]*grid->leafs[i].size[1]*grid->leafs[i].size[2];
+
+		//Count the maximum styles needed for this leaf.
+		leafdataofs = ctx.ofs;
+		for (k = 0; k < j; k++)
+		{
+			s = ReadByte(&ctx);
+			if (s == 255)
+				continue;
+			if (ms < s)
+				ms = s;
+			ctx.ofs += s*4;
+		}
+		ctx.ofs = leafdataofs;
+		grid->leafs[i].numstyles = ms;
+
 		while (j --> 0)
 		{
 			s = ReadByte(&ctx);
@@ -3070,25 +3089,25 @@ void BSPX_LightGridLoad(model_t *model, bspx_header_t *bspx, qbyte *mod_base)
 			{
 				for (k = 0; k < s; k++)
 				{
-					if (k >= 4)
-						ReadInt(&ctx);
+					if (k >= ms)
+						ReadInt(&ctx);	//shouldn't be possible...
 					else
 					{
-						samp->map[k].style = ReadByte(&ctx);
-						samp->map[k].rgb[0] = ReadByte(&ctx);
-						samp->map[k].rgb[1] = ReadByte(&ctx);
-						samp->map[k].rgb[2] = ReadByte(&ctx);
+						samp[k].style = ReadByte(&ctx);
+						samp[k].rgb[0] = ReadByte(&ctx);
+						samp[k].rgb[1] = ReadByte(&ctx);
+						samp[k].rgb[2] = ReadByte(&ctx);
 					}
 				}
-				for (; k < 4; k++)
+				for (; k < ms; k++)
 				{
-					samp->map[k].style = (qbyte)~0u;
-					samp->map[k].rgb[0] =
-					samp->map[k].rgb[1] =
-					samp->map[k].rgb[2] = 0;
+					samp[k].style = k?(qbyte)~0u:0;
+					samp[k].rgb[0] =
+					samp[k].rgb[1] =
+					samp[k].rgb[2] = 0;
 				}
 			}
-			samp++;
+			samp+=ms;
 		}
 	}
 
@@ -3097,7 +3116,7 @@ void BSPX_LightGridLoad(model_t *model, bspx_header_t *bspx, qbyte *mod_base)
 
 	model->lightgrid = (void*)grid;
 }
-static int BSPX_LightGridSingleValue(bspxlightgrid_t *grid, int x, int y, int z, vec3_t res_diffuse)
+static float BSPX_LightGridSingleValue(bspxlightgrid_t *grid, int x, int y, int z, float w, vec3_t res_diffuse)
 {
 	int i;
 	unsigned int node;
@@ -3108,7 +3127,7 @@ static int BSPX_LightGridSingleValue(bspxlightgrid_t *grid, int x, int y, int z,
 	while (!(node & LGNODE_LEAF))
 	{
 		struct bspxlgnode_s *n;
-		if (node & LGNODE_MISSING)
+		if (node >= grid->numnodes) // also node&LGNODE_MISSING
 			return 0;	//failure
 		n = grid->nodes + node;
 		node = n->child[
@@ -3128,41 +3147,54 @@ static int BSPX_LightGridSingleValue(bspxlightgrid_t *grid, int x, int y, int z,
 			return 0;	//sample we're after is out of bounds...
 
 		i = x + leaf->size[0]*(y + leaf->size[1]*z);
-		samp = leaf->rgbvalues + i;
+		samp = leaf->rgbvalues + i*leaf->numstyles;
 
 		//no hdr support
-		for (i = 0; i < 4; i++)
+		for (i = 0; i < leaf->numstyles; i++)
 		{
-			if (samp->map[i].style == ((qbyte)(~0u)))
+			if (samp[i].style == ((qbyte)(~0u)))
 				break;	//no more
-			lev = d_lightstylevalue[samp->map[i].style]*(1/255.0);
-			res_diffuse[0] += samp->map[i].rgb[0] * lev * cl_lightstyle[samp->map[i].style].colours[0];
-			res_diffuse[1] += samp->map[i].rgb[1] * lev * cl_lightstyle[samp->map[i].style].colours[1];
-			res_diffuse[2] += samp->map[i].rgb[2] * lev * cl_lightstyle[samp->map[i].style].colours[2];
+			if (samp[i].style < cl_max_lightstyles)
+			{
+				lev = d_lightstylevalue[samp[i].style]*w;
+				res_diffuse[0] += samp[i].rgb[0] * lev * cl_lightstyle[samp[i].style].colours[0];
+				res_diffuse[1] += samp[i].rgb[1] * lev * cl_lightstyle[samp[i].style].colours[1];
+				res_diffuse[2] += samp[i].rgb[2] * lev * cl_lightstyle[samp[i].style].colours[2];
+			}
 		}
+		if (i == 0)
+			w = 0;
 	}
-	return 1;
+	return w;
 }
 static void BSPX_LightGridValue(void *lightgridinfo, const vec3_t point, vec3_t res_diffuse, vec3_t res_ambient, vec3_t res_dir)
 {
 	bspxlightgrid_t *grid = lightgridinfo;
-	int tile[3];
-	int i;
-	int s;
+	int i, tile[3];
+	float w, s, frac[3];
 
 	VectorSet(res_diffuse, 0, 0, 0);	//assume worst
 	VectorSet(res_ambient, 0, 0, 0);	//assume worst
 	VectorSet(res_dir, 1, 0, 1);		//super lame
 
 	for (i = 0; i < 3; i++)
-		tile[i] = (point[i] - grid->mins[i]) * grid->gridscale[i];
+	{
+		tile[i] = floor((point[i] - grid->mins[i]) * grid->gridscale[i]);
+		frac[i] = (point[i] - grid->mins[i]) * grid->gridscale[i] - tile[i];
+	}
 
 	for (i = 0, s = 0; i < 8; i++)
-		s += BSPX_LightGridSingleValue(grid,	tile[0]+!!(i&1),
+	{
+		w =	((i&1)?frac[0]:1-frac[0])	//keep the lerping vaugely smooth.
+		  * ((i&2)?frac[1]:1-frac[1])
+		  * ((i&4)?frac[2]:1-frac[2]);
+		s += w*BSPX_LightGridSingleValue(grid,	tile[0]+!!(i&1),
 												tile[1]+!!(i&2),
-												tile[2]+!!(i&4), res_diffuse);
+												tile[2]+!!(i&4), w, res_diffuse);
+	}
 
-	VectorScale(res_diffuse, 1.0/s, res_diffuse);	//average the successful ones
+	if (s)
+		VectorScale(res_diffuse, 1.0/(s*255), res_diffuse);	//average the successful ones
 	VectorScale(res_diffuse, 0.5, res_ambient);	//and fix up ambients.
 }
 
@@ -3222,9 +3254,9 @@ void GLQ1BSP_LightPointValues(model_t *model, const vec3_t point, vec3_t res_dif
 		res_diffuse[2] = r[2];
 
 		/*bright on one side, dark on the other, but not too dark*/
-		res_ambient[0] = r[0]/2;
-		res_ambient[1] = r[1]/2;
-		res_ambient[2] = r[2]/2;
+		res_ambient[0] = r[0];
+		res_ambient[1] = r[1];
+		res_ambient[2] = r[2];
 
 		res_dir[0] = r[3];
 		res_dir[1] = r[4];
diff --git a/engine/gl/gl_rmain.c b/engine/gl/gl_rmain.c
index 3e517ead4..7da3a9f17 100644
--- a/engine/gl/gl_rmain.c
+++ b/engine/gl/gl_rmain.c
@@ -76,10 +76,6 @@ extern cvar_t gl_blendsprites;
 extern cvar_t r_portaldrawplanes;
 extern cvar_t r_portalonly;
 
-#ifdef R_XFLIP
-cvar_t	r_xflip = CVAR("leftisright", "0");
-#endif
-
 extern	cvar_t	scr_fov;
 
 static shader_t *scenepp_rescaled;
@@ -432,7 +428,7 @@ void R_RotateForEntity (float *m, float *modelview, const entity_t *e, const mod
 R_SetupGL
 =============
 */
-static void R_SetupGL (vec3_t eyeangorg[2], vec4_t fovoverrides, float projmatrix[16]/*for webvr*/, texid_t fbo)
+static void R_SetupGL (const float eyematrix[12]/*can be null*/, const vec4_t fovoverrides/*can be null*/, const float projmatrix[16]/*can be null*/, const pxrect_t *viewport/*can be null*/, texid_t fbo/*can be null*/)
 {
 	int		x, x2, y2, y, w, h;
 	vec3_t newa;
@@ -447,18 +443,16 @@ static void R_SetupGL (vec3_t eyeangorg[2], vec4_t fovoverrides, float projmatri
 		newa[0] = r_refdef.viewangles[0];
 		newa[1] = r_refdef.viewangles[1];
 		newa[2] = r_refdef.viewangles[2] + gl_screenangle.value;
-		if (eyeangorg)
+		if (eyematrix)
 		{
 			extern cvar_t in_vraim;
 			matrix3x4 basematrix;
-			matrix3x4 eyematrix;
 			matrix3x4 viewmatrix;
 
-			Matrix3x4_RM_FromAngles(eyeangorg[0], eyeangorg[1], eyematrix[0]);
 			if (r_refdef.base_known)
 			{	//mod is specifying its own base ang+org.
 				Matrix3x4_RM_FromAngles(r_refdef.base_angles, r_refdef.base_origin, basematrix[0]);
-				Matrix3x4_Multiply(eyematrix[0], basematrix[0], viewmatrix[0]);
+				Matrix3x4_Multiply(eyematrix, basematrix[0], viewmatrix[0]);
 				Matrix3x4_RM_ToVectors(viewmatrix[0], vpn, vright, vup, r_origin);
 				VectorNegate(vright, vright);
 			}
@@ -469,7 +463,7 @@ static void R_SetupGL (vec3_t eyeangorg[2], vec4_t fovoverrides, float projmatri
 				if (in_vraim.ival)
 					newa[1] -= SHORT2ANGLE(r_refdef.playerview->vrdev[VRDEV_HEAD].angles[YAW]);
 				Matrix3x4_RM_FromAngles(newa, r_refdef.vieworg, basematrix[0]);
-				Matrix3x4_Multiply(eyematrix[0], basematrix[0], viewmatrix[0]);
+				Matrix3x4_Multiply(eyematrix, basematrix[0], viewmatrix[0]);
 				Matrix3x4_RM_ToVectors(viewmatrix[0], vpn, vright, vup, r_origin);
 				VectorNegate(vright, vright);
 			}
@@ -485,7 +479,11 @@ static void R_SetupGL (vec3_t eyeangorg[2], vec4_t fovoverrides, float projmatri
 		//
 		// set up viewpoint
 		//
-		if (fbo)
+		if (viewport)
+		{
+			r_refdef.pxrect = *viewport;
+		}
+		else if (fbo)
 		{
 			//with VR fbo postprocessing, we disable all viewport.
 			r_refdef.pxrect.x = 0;
@@ -605,6 +603,15 @@ static void R_SetupGL (vec3_t eyeangorg[2], vec4_t fovoverrides, float projmatri
 				fov_u = fov_y / 2;
 			}
 
+			if (r_xflip.ival)
+			{
+				float t = fov_l;
+				fov_l = fov_r;
+				fov_r = t;
+				r_refdef.flipcull ^= SHADER_CULL_FLIP;
+				fovv_x *= -1;
+			}
+
 			if (r_refdef.useperspective)
 			{
 				float maxdist = r_refdef.maxdist;
@@ -623,9 +630,8 @@ static void R_SetupGL (vec3_t eyeangorg[2], vec4_t fovoverrides, float projmatri
 				Matrix4x4_CM_Orthographic(r_refdef.m_projection_std, -fov_x/2, fov_x/2, -fov_y/2, fov_y/2, r_refdef.mindist, r_refdef.maxdist?r_refdef.maxdist:9999);
 				memcpy(r_refdef.m_projection_view, r_refdef.m_projection_std, sizeof(r_refdef.m_projection_view));
 			}
-
-			Matrix4x4_CM_ModelViewMatrixFromAxis(r_refdef.m_view, vpn, vright, vup, r_origin);
 		}
+		Matrix4x4_CM_ModelViewMatrixFromAxis(r_refdef.m_view, vpn, vright, vup, r_origin);
 
 		//bias the viewmodel depth range to a third: -1 through -0.333 (instead of -1 to 1)
 		r_refdef.m_projection_view[2+4*0] *= 0.333;
@@ -722,6 +728,10 @@ static void R_RenderScene_Internal(void)
 		vec3_t diff;
 		float d;
 		vec3_t ctrlang, ctrlorg, aimdir;
+		extern cvar_t cl_vrui_lock;
+
+		if (cl_vrui_lock.ival)
+			VRUI_SnapAngle();
 
 //		extern usercmd_t cl_pendingcmd[MAX_SPLITS];
 		AngleVectors(vrui.angles, uifwd, uiright, uiup);
@@ -785,7 +795,7 @@ static void R_RenderScene_Internal(void)
 		GL_SetShaderState2D(false);
 	}
 }
-static void R_RenderEyeScene (texid_t rendertarget, vec4_t fovoverride, vec3_t eyeangorg[2])
+static void R_RenderEyeScene (texid_t rendertarget, const pxrect_t *viewport, const vec4_t fovoverride, const float projmatrix[16], const float eyematrix[12])
 {
 	extern qboolean depthcleared;
 	refdef_t refdef = r_refdef;
@@ -809,7 +819,7 @@ static void R_RenderEyeScene (texid_t rendertarget, vec4_t fovoverride, vec3_t e
 		vid.fbpheight = rendertarget->height;
 	}
 
-	R_SetupGL (eyeangorg, fovoverride, NULL, rendertarget);
+	R_SetupGL (eyematrix, fovoverride, projmatrix, viewport, rendertarget);
 	R_RenderScene_Internal();
 
 	if (rendertarget)
@@ -832,6 +842,7 @@ static void R_RenderScene (void)
 	int cull = r_refdef.flipcull;
 	unsigned int colourmask = r_refdef.colourmask;
 	vec3_t eyeangorg[2];
+	float eyematrix[12];
 	extern qboolean		depthcleared;
 
 	r_refdef.colourmask = 0u;
@@ -867,7 +878,7 @@ static void R_RenderScene (void)
 		GL_ForceDepthWritable();
 		qglClear (GL_DEPTH_BUFFER_BIT);
 
-		R_SetupGL (NULL, NULL, NULL, NULL);
+		R_SetupGL (NULL, NULL, NULL, NULL, NULL);
 		R_RenderScene_Internal();
 	}
 	else for (i = 0; i < stereoframes; i++)
@@ -930,7 +941,8 @@ static void R_RenderScene (void)
 		eyeangorg[0][1] = r_stereo_convergence.value * (i?0.5:-0.5);
 		eyeangorg[0][2] = 0;
 		VectorSet(eyeangorg[1], 0, stereooffset[i], 0);
-		R_SetupGL (eyeangorg, NULL, NULL, NULL);
+		Matrix3x4_RM_FromAngles(eyeangorg[0], eyeangorg[1], eyematrix);
+		R_SetupGL (eyematrix, NULL, NULL, NULL, NULL);
 		R_RenderScene_Internal ();
 	}
 
@@ -1951,7 +1963,7 @@ qboolean R_RenderScene_Cubemap(void)
 }
 #endif
 
-texid_t R_RenderPostProcess (texid_t sourcetex, int type, shader_t *shader, char *restexname)
+texid_t R_RenderPostProcess (texid_t sourcetex, texid_t sourcedepth, int type, shader_t *shader, char *restexname)
 {
 	if (r_refdef.flags & type)
 	{
@@ -1964,7 +1976,7 @@ texid_t R_RenderPostProcess (texid_t sourcetex, int type, shader_t *shader, char
 			int h = (r_refdef.vrect.height * vid.pixelheight) / vid.height;
 			if (R2D_Flush)
 				R2D_Flush();
-			GLBE_FBO_Sources(sourcetex, r_nulltex);
+			GLBE_FBO_Sources(sourcetex, sourcedepth);
 			sourcetex = R2D_RT_Configure(restexname, w, h, TF_RGBA32, RT_IMAGEFLAGS);
 			GLBE_FBO_Update(&fbo_postproc, 0, &sourcetex, 1, r_nulltex, w, h, 0);
 			R2D_ScalePic(0, 0, r_refdef.vrect.width, r_refdef.vrect.height, shader);
@@ -1977,7 +1989,7 @@ texid_t R_RenderPostProcess (texid_t sourcetex, int type, shader_t *shader, char
 			//update stuff now that we're not rendering the 3d scene
 			if (R2D_Flush)
 				R2D_Flush();
-			GLBE_FBO_Sources(sourcetex, r_nulltex);
+			GLBE_FBO_Sources(sourcetex, sourcedepth);
 			R2D_ScalePic(r_refdef.vrect.x, r_refdef.vrect.y, r_refdef.vrect.width, r_refdef.vrect.height, shader);
 			if (R2D_Flush)
 				R2D_Flush();
@@ -1999,10 +2011,12 @@ void GLR_RenderView (void)
 	int dofbo = *r_refdef.rt_destcolour[0].texname || *r_refdef.rt_depth.texname;
 	double	time1 = 0, time2;
 	texid_t sourcetex = r_nulltex;
+	texid_t sourcedepth = r_nulltex;
 	shader_t *custompostproc = NULL;
 	float renderscale;	//extreme, but whatever
 	int oldfbo = 0;
 	qboolean forcedfb = false;
+	qboolean fbdepth = false;
 
 	checkglerror();
 
@@ -2086,6 +2100,16 @@ void GLR_RenderView (void)
 
 		if (r_hdr_framebuffer.ival && !(vid.flags & VID_FP16))	//primary use of this cvar is to fix q3shader overbrights (so bright lightmaps can oversaturate then drop below 1 by modulation with the lightmap
 			forcedfb = true;
+		if (custompostproc)
+		{
+			int i;
+			for (i = 0; i < custompostproc->numpasses; i++)
+				if (custompostproc->passes[i].texgen == T_GEN_SOURCEDEPTH)
+				{
+					fbdepth = true;
+					break;
+				}
+		}
 		if (vid_hardwaregamma.ival == 4 && (v_gamma.value != 1 || v_contrast.value != 1 || v_contrastboost.value != 1|| v_brightness.value != 0))
 			r_refdef.flags |= RDF_SCENEGAMMA;
 	}
@@ -2159,6 +2183,7 @@ void GLR_RenderView (void)
 	{
 		unsigned int rtflags = IF_NOMIPMAP|IF_CLAMP|IF_RENDERTARGET|IF_NOSRGB;
 		enum uploadfmt fmt;
+		unsigned int fboflags = 0;
 
 		r_refdef.flags |= RDF_RENDERSCALE;
 
@@ -2213,8 +2238,24 @@ void GLR_RenderView (void)
 		}
 
 		sourcetex = R2D_RT_Configure("rt/$lastgameview", vid.fbpwidth, vid.fbpheight, fmt, rtflags);
+		if (fbdepth)
+		{
+			if (sh_config.texfmt[PTI_DEPTH24_8] && !r_shadow_shadowmapping.ival)
+				fmt = PTI_DEPTH24_8;
+			else if (sh_config.texfmt[PTI_DEPTH32])
+				fmt = PTI_DEPTH32;
+			else
+				fmt = PTI_DEPTH16;
+		}
+		else
+			fmt = PTI_INVALID;
+		sourcedepth = (fmt != PTI_INVALID)?R2D_RT_Configure("rt/$lastgameviewdepth", vid.fbpwidth, vid.fbpheight, fmt, rtflags):r_nulltex;
+		if (sourcedepth)
+			fboflags = FBO_TEX_DEPTH;
+		else
+			fboflags = FBO_RB_DEPTH;
 
-		oldfbo = GLBE_FBO_Update(&fbo_gameview, FBO_RB_DEPTH, &sourcetex, 1, r_nulltex, vid.fbpwidth, vid.fbpheight, 0);
+		oldfbo = GLBE_FBO_Update(&fbo_gameview, fboflags, &sourcetex, 1, sourcedepth, vid.fbpwidth, vid.fbpheight, 0);
 		dofbo = true;
 	}
 	else if (vid.framebuffer)
@@ -2301,7 +2342,7 @@ void GLR_RenderView (void)
 
 	if (forcedfb && !(r_refdef.flags & RDF_ALLPOSTPROC))
 	{
-		GLBE_FBO_Sources(sourcetex, r_nulltex);
+		GLBE_FBO_Sources(sourcetex, sourcedepth);
 		R2D_Image(r_refdef.vrect.x, r_refdef.vrect.y, r_refdef.vrect.width, r_refdef.vrect.height, 0, 1, 1, 0, scenepp_rescaled);
 	}
 	else
@@ -2309,12 +2350,12 @@ void GLR_RenderView (void)
 		if (r_refdef.flags & RDF_SCENEGAMMA)
 		{
 			R2D_ImageColours (v_gammainverted.ival?v_gamma.value:(1/v_gamma.value), v_contrast.value, v_brightness.value, v_contrastboost.value);
-			sourcetex = R_RenderPostProcess (sourcetex, RDF_SCENEGAMMA, scenepp_gamma, "rt/$gammaed");
+			sourcetex = R_RenderPostProcess (sourcetex, sourcedepth, RDF_SCENEGAMMA, scenepp_gamma, "rt/$gammaed");
 			R2D_ImageColours (1, 1, 1, 1);
 		}
-		sourcetex = R_RenderPostProcess (sourcetex, RDF_WATERWARP, scenepp_waterwarp, "rt/$waterwarped");
-		sourcetex = R_RenderPostProcess (sourcetex, RDF_CUSTOMPOSTPROC, custompostproc, "rt/$postproced");
-		sourcetex = R_RenderPostProcess (sourcetex, RDF_ANTIALIAS, scenepp_antialias, "rt/$antialiased");
+		sourcetex = R_RenderPostProcess (sourcetex, sourcedepth, RDF_WATERWARP, scenepp_waterwarp, "rt/$waterwarped");
+		sourcetex = R_RenderPostProcess (sourcetex, sourcedepth, RDF_CUSTOMPOSTPROC, custompostproc, "rt/$postproced");
+		sourcetex = R_RenderPostProcess (sourcetex, sourcedepth, RDF_ANTIALIAS, scenepp_antialias, "rt/$antialiased");
 		if (r_refdef.flags & RDF_BLOOM)
 			R_BloomBlend(sourcetex, r_refdef.vrect.x, r_refdef.vrect.y, r_refdef.vrect.width, r_refdef.vrect.height);
 	}
diff --git a/engine/gl/gl_screen.c b/engine/gl/gl_screen.c
index d365b6990..fd3283678 100644
--- a/engine/gl/gl_screen.c
+++ b/engine/gl/gl_screen.c
@@ -184,7 +184,7 @@ qboolean GLSCR_UpdateScreen (void)
 #endif
 		else
 		{
-			if ((r_worldentity.model && cls.state == ca_active) || vid.vr || vrui.enabled)
+			if ((r_worldentity.model && cls.state == ca_active) || vrui.enabled)
 				V_RenderView (nohud);
 			else
 				noworld = true;
diff --git a/engine/gl/gl_vidcommon.c b/engine/gl/gl_vidcommon.c
index 0c8b25846..93e5ea684 100644
--- a/engine/gl/gl_vidcommon.c
+++ b/engine/gl/gl_vidcommon.c
@@ -463,6 +463,48 @@ void APIENTRY GL_ClientActiveTextureStub(GLenum texid)
 {
 }
 
+static qboolean GL_ParseVersionTupple(char *id, int offset, unsigned int ver[3])
+{
+	if (id)
+	{
+		id += offset;
+		ver[0] = strtoul(id, &id, 10);
+		if (*id == '.')
+		{
+			ver[1] = strtoul(id+1, &id, 10);
+			if (*id == '.')
+			{
+				ver[2] = strtoul(id+1, &id, 10);
+				return true;
+			}
+		}
+	}
+	ver[0] = ver[1] = ver[2] = 0;
+	return false;
+}
+static qboolean GL_IsVersionTuppleGreaterEqual(unsigned int ver[3], unsigned int max0, unsigned int max1, unsigned int max2)
+{
+	if (ver[0] > max0)
+		return true;
+	if (ver[0] == max0)
+	{
+		if (ver[1] > max1)
+			return true;
+		if (ver[1] == max1)
+		{
+			if (ver[2] >= max2)
+				return true;
+		}
+	}
+	return false;
+}
+static qboolean GL_IsVersionTuppleWithin(unsigned int ver[3], unsigned int min0, unsigned int min1, unsigned int min2, unsigned int max0, unsigned int max1, unsigned int max2)
+{
+	if (GL_IsVersionTuppleGreaterEqual(ver, max0, max1, max2))
+		return false;	//more recent
+	return GL_IsVersionTuppleGreaterEqual(ver, min0, min1, min2);
+}
+
 #define getglcore getglfunction
 #define getglext(name) getglfunction(name)
 static qboolean GL_CheckExtensions (void *(*getglfunction) (char *name))
@@ -470,8 +512,11 @@ static qboolean GL_CheckExtensions (void *(*getglfunction) (char *name))
 	qboolean webgl = false;
 	unsigned int gl_major_version = 0;
 	unsigned int gl_minor_version = 0;
+	unsigned int mesaver[3];
 	memset(&gl_config, 0, sizeof(gl_config));
 
+	GL_ParseVersionTupple(strstr(gl_version, " Mesa "), 6, mesaver);
+
 	if (!strncmp(gl_version, "WebGL", 5))
 	{
 		gl_config.gles = true;
@@ -1117,18 +1162,20 @@ static qboolean GL_CheckExtensions (void *(*getglfunction) (char *name))
 
 		Con_DPrintf("GLSL available\n");
 	}
+#endif
 
 	if (Cvar_Get("gl_blacklist_invariant", "0", CVAR_VIDEOLATCH, "gl blacklists")->ival)
 		gl_config.blacklist_invariant = true;
 	else if (gl_config.arb_shader_objects && !gl_config_nofixedfunc &&
 		(strstr(gl_renderer, " Mesa ") || strstr(gl_version, " Mesa ")) && Cvar_Get("gl_blacklist_mesa_invariant", "1", CVAR_VIDEOLATCH, "gl blacklists")->ival)
-	{
-		gl_config.blacklist_invariant = true;
-		Con_Printf(CON_NOTICE "Mesa detected, disabling the use of glsl's invariant keyword."CON_DEFAULT" This will result in z-fighting. Use '+set gl_blacklist_mesa_invariant 0' on the commandline to reenable it (but you will probably get glsl compilation errors from your driver).\n");
+	{	//should be fixed with 19.1.0
+		if (GL_IsVersionTuppleWithin(mesaver, 0,0,1/*fixme*/, 19,1,0))
+		{
+			gl_config.blacklist_invariant = true;	//assume yes
+			Con_Printf(CON_NOTICE "Mesa detected, disabling the use of glsl's invariant keyword."CON_DEFAULT" This will result in z-fighting. Use '+set gl_blacklist_mesa_invariant 0' on the commandline to reenable it (but you will probably get glsl compilation errors from your driver).\n");
+		}
 	}
 
-#endif
-
 	qglGetProgramBinary = NULL;
 	qglProgramBinary = NULL;
 	if (gl_config.arb_shader_objects)
@@ -2293,10 +2340,10 @@ static GLhandleARB GLSlang_CreateShader (program_t *prog, const char *name, int
 				"#define shadow2D texture\n"
 				//gl_FragColor and gl_FragData got deprecated too, need to make manual outputs
 				"#if __VERSION__ >= 300\n"	//gl3.3, gles3 (gles3 requires layout stuff)
-					"layout(location = 0) out vec4 fte_fragdata0;"
-					"layout(location = 1) out vec4 fte_fragdata1;"
-					"layout(location = 2) out vec4 fte_fragdata2;"
-					"layout(location = 3) out vec4 fte_fragdata3;"
+					"layout(location=0) out vec4 fte_fragdata0;"
+					"layout(location=1) out vec4 fte_fragdata1;"
+					"layout(location=2) out vec4 fte_fragdata2;"
+					"layout(location=3) out vec4 fte_fragdata3;"
 				"\n#else\n"
 					"out vec4 fte_fragdata0;"
 					"out vec4 fte_fragdata1;"
diff --git a/engine/gl/gl_viddroid.c b/engine/gl/gl_viddroid.c
index ebc057b03..54c1ab10b 100644
--- a/engine/gl/gl_viddroid.c
+++ b/engine/gl/gl_viddroid.c
@@ -301,6 +301,14 @@ void GLVID_SetCaption(const const char *caption)
 	// :(
 }
 
+static int GLES1VID_GetPriority(void)
+{	//assumed 1 when not defined.
+	return 1;	//gles1 sucks, and lacks lots of features.
+}
+static int GLES2VID_GetPriority(void)
+{   //assumed 1 when not defined.
+	return 2;	//urgh, betterer than gles1 at least.
+}
 void VID_Register(void)
 {
 	//many android devices have drivers for both gles1 AND gles2.
@@ -311,6 +319,8 @@ void VID_Register(void)
 	gles1rendererinfo.description = "OpenGL ES 1";
 	memset(&gles1rendererinfo.name, 0, sizeof(gles1rendererinfo.name));	//make sure there's no 'gl' etc names.
 	gles1rendererinfo.name[0] = "gles1";
+	gles1rendererinfo.VID_GetPriority = GLES1VID_GetPriority;
+	openglrendererinfo.VID_GetPriority = GLES2VID_GetPriority;
 	R_RegisterRenderer(NULL, &gles1rendererinfo);
 }
 
@@ -320,7 +330,7 @@ void VID_Register(void)
 static qboolean VKVID_CreateSurface(void)
 {
 	VkResult err;
-	VkAndroidSurfaceCreateInfoKHR createInfo = {VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR};
+	VkAndroidSurfaceCreateInfoKHR createInfo = {VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR};
 	createInfo.flags = 0;
 	createInfo.window = sys_nativewindow;
 	err = vkCreateAndroidSurfaceKHR(vk.instance, &createInfo, NULL, &vk.surface);
@@ -372,6 +382,10 @@ static void VKVID_SwapBuffers(void)
 	// :(
 }
 
+static int VKVID_GetPriority(void)
+{	//assumed 1 when not defined.
+	return 3;	//make it a higher priority than our opengles implementation, because of the infamous black-screens bug that has been plaguing us for years.
+}
 rendererinfo_t vkrendererinfo =
 {
 	"Vulkan",
@@ -426,6 +440,7 @@ rendererinfo_t vkrendererinfo =
 
 	VKBE_RenderToTextureUpdate2d,
 
-	"no more"
+	"no more",
+	VKVID_GetPriority,
 };
 #endif
diff --git a/engine/gl/gl_vidlinuxglx.c b/engine/gl/gl_vidlinuxglx.c
index 94b462ef9..f11ef77d9 100644
--- a/engine/gl/gl_vidlinuxglx.c
+++ b/engine/gl/gl_vidlinuxglx.c
@@ -88,6 +88,9 @@ static qboolean XVK_SetupSurface_XCB(void);
 #ifndef NO_X11_RANDR
 	#define USE_XRANDR
 #endif
+#ifndef NO_X11_XSS
+	#define USE_XSS
+#endif
 
 #include <X11/keysym.h>
 #include <X11/cursorfont.h>
@@ -376,6 +379,63 @@ static qboolean x11_initlib(void)
 	return !!x11.lib;
 }
 
+#ifdef USE_XSS
+#include <X11/extensions/scrnsaver.h>
+static struct {
+	void *lib;
+	int event, error;
+	int major, minor;
+
+	Bool (*pXScreenSaverQueryExtension)(Display *dpy, int *event_base_return, int *error_base_return);
+	Status (*pXScreenSaverQueryVersion)(Display *dpy, int *major_version_return, int *minor_version_return);
+
+	void (*pXScreenSaverSuspend)(Display *dpy, Bool suspend);
+
+	qboolean cansuspend;
+	qboolean suspending;
+} x11xss;
+static qboolean X11Xss_Init(void)
+{
+	static dllfunction_t x11xss_functable[] =
+	{
+		{(void**)&x11xss.pXScreenSaverQueryExtension,	"XScreenSaverQueryExtension"},
+		{(void**)&x11xss.pXScreenSaverQueryVersion,		"XScreenSaverQueryVersion"},
+		{(void**)&x11xss.pXScreenSaverSuspend,			"XScreenSaverSuspend"},
+	};
+	if (!x11xss.lib)
+		x11xss.lib = Sys_LoadLibrary("libXss.so.1", x11xss_functable);
+	x11xss.cansuspend = false;
+	x11xss.suspending = false;	//must be recalled for each new dpy...
+	if (x11xss.lib)
+	{
+		if (x11xss.pXScreenSaverQueryExtension(vid_dpy, &x11xss.event, &x11xss.error))
+			if (x11xss.pXScreenSaverQueryVersion(vid_dpy, &x11xss.major, &x11xss.minor))
+				if (x11xss.major>1 || (x11xss.major==1&&x11xss.minor>=1))
+					x11xss.cansuspend = true;
+	}
+	return x11xss.cansuspend;
+}
+static void X11Xss_SuspendSaver(qboolean suspend)
+{
+	if (!x11xss.cansuspend)
+		return; //no can do, sorry
+	if (x11xss.suspending != suspend)
+	{
+		x11xss.suspending = suspend;
+		x11xss.pXScreenSaverSuspend(vid_dpy, suspend);	//this is refcounted, but we're asserting.
+	}
+}
+#else
+static qboolean X11Xss_Init(void)
+{
+	return false;
+}
+static void X11Xss_SuspendSaver(qboolean suspend)
+{
+}
+#endif
+
+
 #ifdef VK_USE_PLATFORM_XCB_KHR
 static struct
 {
@@ -2784,6 +2844,8 @@ static void UpdateGrabs(void)
 		else
 			x11.pXUndefineCursor(vid_dpy, vid_window);
 	}
+
+	X11Xss_SuspendSaver(cls.demoplayback && vid.activeapp);
 }
 
 static void ClearAllStates (void)
@@ -4466,6 +4528,7 @@ static qboolean X11VID_Init (rendererstate_t *info, unsigned char *palette, int
 		Con_DPrintf("Using X11 mouse\n");
 	}
 	XCursor_Init();
+	X11Xss_Init();
 
 	if (fullscreenflags & FULLSCREEN_LEGACY)
 		x11.pXMoveResizeWindow(vid_dpy, vid_window, fullscreenx, fullscreeny, fullscreenwidth, fullscreenheight);
diff --git a/engine/gl/gl_vidnt.c b/engine/gl/gl_vidnt.c
index 611a9767f..d9d56f9d2 100644
--- a/engine/gl/gl_vidnt.c
+++ b/engine/gl/gl_vidnt.c
@@ -838,6 +838,25 @@ static qboolean Win32VK_AttachVulkan (rendererstate_t *info)
 
 	return VK_Init(info, extnames, Win32VK_CreateSurface, Win32VK_Present);
 }
+static qboolean Win32VK_EnumerateDevices(void *usercontext, void(*callback)(void *context, const char *devicename, const char *outputname, const char *desc))
+{
+	qboolean ret = false;
+#ifdef VK_NO_PROTOTYPES
+	PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr;
+	dllfunction_t func[] =
+	{
+		{(void*)&vkGetInstanceProcAddr,		"vkGetInstanceProcAddr"},
+		{NULL,							NULL}
+	};
+
+	if (!hInstVulkan)
+		hInstVulkan = Sys_LoadLibrary("vulkan-1.dll", func);
+	if (!hInstVulkan)
+		return false;
+#endif
+	ret = VK_EnumerateDevices(usercontext, callback, "Vulkan-", vkGetInstanceProcAddr);
+	return ret;
+}
 #endif
 
 
@@ -3160,30 +3179,39 @@ static LONG WINAPI GLMainWndProc (
 			break;
 
 		case WM_DROPFILES:
-		{
-			HDROP p = (HDROP)wParam;
-			wchar_t fnamew[MAX_PATH];
-			char fname[MAX_PATH];
-			vfsfile_t *f;
-			int i, count = DragQueryFile(p, ~0, NULL, 0);
-			for(i = 0; i < count; i++)
 			{
-				if (WinNT)
+				HDROP p = (HDROP)wParam;
+				wchar_t fnamew[MAX_PATH];
+				char fname[MAX_PATH];
+				vfsfile_t *f;
+				int i, count = DragQueryFile(p, ~0, NULL, 0);
+				for(i = 0; i < count; i++)
 				{
-					DragQueryFileW(p, i, fnamew, countof(fnamew));
-					narrowen(fname, sizeof(fname), fnamew);
+					if (WinNT)
+					{
+						DragQueryFileW(p, i, fnamew, countof(fnamew));
+						narrowen(fname, sizeof(fname), fnamew);
+					}
+					else
+						DragQueryFileA(p, i, fname, countof(fname));
+					f = FS_OpenVFS(fname, "rb", FS_SYSTEM);
+					if (f)
+						Host_RunFile(fname, strlen(fname), f);
 				}
-				else
-					DragQueryFileA(p, i, fname, countof(fname));
-				f = FS_OpenVFS(fname, "rb", FS_SYSTEM);
-				if (f)
-					Host_RunFile(fname, strlen(fname), f);
+				DragFinish(p);
 			}
-			DragFinish(p);
 			return 0;	//An application should return zero if it processes this message.
-		}
-		break;
 
+		case WM_SYSCOMMAND:	//this only works when we're the active app. which is fine.
+			if (GET_SC_WPARAM(wParam)==SC_SCREENSAVE)
+				lRet = 0;	//try to block sscreensavers, if enabled... will likely fail due to passwords and security stuff etc...
+			else if (GET_SC_WPARAM(wParam)==SC_MONITORPOWER && (lParam == 1 || lParam == 2))
+				lRet = 0;	//try to block monitor power saving.
+			else if (WinNT)
+				lRet = DefWindowProcW (hWnd, uMsg, wParam, lParam);
+			else
+				lRet = DefWindowProcA (hWnd, uMsg, wParam, lParam);
+			break;
 #ifdef HAVE_CDPLAYER
 		case MM_MCINOTIFY:
 #ifdef WTHREAD
@@ -3453,7 +3481,10 @@ rendererinfo_t vkrendererinfo =
 
 	VKBE_RenderToTextureUpdate2d,
 
-	"no more"
+	"no more",
+	NULL,	//getpriority
+	NULL,	//enummodes
+	Win32VK_EnumerateDevices,	//enumdevices
 };
 
 
@@ -3517,7 +3548,10 @@ rendererinfo_t nvvkrendererinfo =
 
 	VKBE_RenderToTextureUpdate2d,
 
-	"no more"
+	"no more",
+	NULL,
+	NULL,
+	NULL,	//reminder that this is the OPENGL device to init.
 };
 #endif
 #endif
diff --git a/engine/gl/gl_vidsdl.c b/engine/gl/gl_vidsdl.c
index 9a6ce4004..03bd58420 100644
--- a/engine/gl/gl_vidsdl.c
+++ b/engine/gl/gl_vidsdl.c
@@ -8,7 +8,7 @@
 	#define OPENGL_SDL
 #endif
 
-#if SDL_MAJOR_VERSION >= 2
+#if SDL_VERSION_ATLEAST(2,0,0)
 	#if SDL_VERSION_ATLEAST(2,0,6)
 		#ifdef VKQUAKE
 			#include <SDL_vulkan.h>
@@ -42,7 +42,7 @@ HWND mainwindow;
 
 extern qboolean vid_isfullscreen;
 
-#if SDL_MAJOR_VERSION < 2
+#if !SDL_VERSION_ATLEAST(2,0,0)
 unsigned short intitialgammaramps[3][256];
 #endif
 
@@ -61,7 +61,7 @@ static void *GLVID_getsdlglfunction(char *functionname)
 }
 #endif
 
-#if SDL_MAJOR_VERSION >= 2
+#if SDL_VERSION_ATLEAST(2,0,0)
 void *GLVID_CreateCursor			(const qbyte *imagedata, int width, int height, uploadfmt_t format, float hotx, float hoty, float scale)
 {
 	SDL_Cursor *curs;
@@ -325,20 +325,18 @@ static qboolean SDLVID_Init (rendererstate_t *info, unsigned char *palette, r_qr
 #endif
 
 	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE);
-#if !defined(FTE_TARGET_WEB) && SDL_MAJOR_VERSION < 2
+#if !defined(FTE_TARGET_WEB) && !SDL_VERSION_ATLEAST(2,0,0)
 	SDL_SetVideoMode(0, 0, 0, 0);	//to get around some SDL bugs
 #endif
 
-#if SDL_MAJOR_VERSION >= 2
+#if SDL_VERSION_ATLEAST(2,0,0)
 	switch(qrenderer)
 	{
 	default:
 		return false;
 #ifdef OPENGL_SDL
 	case QR_OPENGL:
-	#if SDL_MAJOR_VERSION >= 2
 		SDL_GL_LoadLibrary(NULL);
-	#endif
 
 		if (info->bpp >= 32)
 		{
@@ -412,7 +410,7 @@ static qboolean SDLVID_Init (rendererstate_t *info, unsigned char *palette, r_qr
 	}
 	flags |= SDL_WINDOW_RESIZABLE;
 	flags |= SDL_WINDOW_INPUT_GRABBED;
-	#if SDL_PATCHLEVEL >= 1
+	#if SDL_VERSION_ATLEAST(2,0,1)
 		flags |= SDL_WINDOW_ALLOW_HIGHDPI;
 	#endif
 
@@ -456,8 +454,8 @@ static qboolean SDLVID_Init (rendererstate_t *info, unsigned char *palette, r_qr
 	}
 #endif
 
-#if SDL_PATCHLEVEL >= 4
-	SDL_GetDisplayDPI(display, NULL, &vid.dpi_x, &vid.dpi_y);
+#if SDL_VERSION_ATLEAST(2,0,4)
+	//SDL_GetDisplayDPI(display, NULL, &vid.dpi_x, &vid.dpi_y);	//unusable rubbish.
 #endif
 
 	CL_UpdateWindowTitle();
@@ -466,7 +464,7 @@ static qboolean SDLVID_Init (rendererstate_t *info, unsigned char *palette, r_qr
 	switch(qrenderer)
 	{
 #ifdef OPENGL_SDL
-#if SDL_PATCHLEVEL >= 1
+#if SDL_VERSION_ATLEAST(2,0,1)
 	case QR_OPENGL:
 		SDL_GL_GetDrawableSize(sdlwindow, &vid.pixelwidth, &vid.pixelheight);	//get the proper physical size.
 		break;
@@ -482,6 +480,14 @@ static qboolean SDLVID_Init (rendererstate_t *info, unsigned char *palette, r_qr
 		break;
 	}
 
+	{	//SDL_GetDisplayDPI is unusable (depends on buggy drivers/hardware), so try and guess based on initial settings. this may cause issues with monitors using different scales though.
+		int ww,wh;
+		SDL_GetWindowSize(sdlwindow, &ww, &wh);
+		vid.dpi_x = (96 * vid.pixelwidth)/ww;
+		vid.dpi_y = (96 * vid.pixelheight)/wh;
+	}
+
+
 #ifdef OPENGL_SDL
 	if (qrenderer == QR_OPENGL)
 	{
@@ -503,9 +509,11 @@ static qboolean SDLVID_Init (rendererstate_t *info, unsigned char *palette, r_qr
 			setup.vrplatform = VR_X11_GLX;
 			break;
 #endif
-//		case SDL_SYSWM_WAYLAND:
-//			setup.vrplatform = VR_EGL;
-//			break;
+#if defined(SDL_VIDEO_DRIVER_WAYLAND) && SDL_VERSION_ATLEAST(3,0,0)
+		case SDL_SYSWM_WAYLAND:
+			setup.vrplatform = VR_EGL;
+			break;
+#endif
 		default:
 			setup.vrplatform = VR_HEADLESS; //unsupported platform...
 			break;
@@ -550,6 +558,16 @@ static qboolean SDLVID_Init (rendererstate_t *info, unsigned char *palette, r_qr
 			setup.x11_glx.glxfbconfig = 0;//???
 			setup.x11_glx.glxcontext = SDL_GL_GetCurrentContext();
 			break;
+#endif
+#if defined(SDL_VIDEO_DRIVER_WAYLAND) && SDL_VERSION_ATLEAST(3,0,0)
+		case SDL_SYSWM_WAYLAND:
+			setup.vrplatform = VR_EGL;
+			setup.egl.getprocaddr = SDL_EGL_GetProcAddress;
+			setup.egl.egldisplay = SDL_EGL_GetCurrentEGLDisplay();
+			setup.egl.eglconfig = SDL_EGL_GetCurrentEGLConfig();
+			setup.egl.eglcontext = SDL_GL_GetCurrentContext();
+			break;
+
 #endif
 		default:
 			setup.vrplatform = VR_HEADLESS; //unsupported platform...
@@ -591,32 +609,32 @@ static qboolean SDLVID_Init (rendererstate_t *info, unsigned char *palette, r_qr
 	if (vid_isfullscreen)
 		IN_ActivateMouse();
 
-#if SDL_MAJOR_VERSION < 2
-	SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
-#else
+#if SDL_VERSION_ATLEAST(2,0,0)
 	SDL_DisableScreenSaver();
+#else
+	SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 #endif
 	vid_vsync.modified = true;
 
 
-	#ifdef _WIN32
+#ifdef _WIN32
 	{	//win32 apis are very insistant upon having a window context for things that have nothing to do with windowing system stuff.
-		#if SDL_MAJOR_VERSION >= 2
-			SDL_SysWMinfo info;
-			SDL_GetWindowWMInfo(sdlwindow, &info);
-			if (info.subsystem == SDL_SYSWM_WINDOWS)
-				mainwindow = info.info.win.window;
-			else
-				mainwindow = NULL;	//if we're using an x11 subsystem but running in windows then don't feck up... here, at least.
-		#else
-			SDL_SysWMinfo wmInfo;
-			SDL_GetWMInfo(&wmInfo);
-			mainwindow = wmInfo.window; //note that this is usually still null
-		#endif
-	}
+	#if SDL_VERSION_ATLEAST(2,0,0)
+		SDL_SysWMinfo info;
+		SDL_GetWindowWMInfo(sdlwindow, &info);
+		if (info.subsystem == SDL_SYSWM_WINDOWS)
+			mainwindow = info.info.win.window;
+		else
+			mainwindow = NULL;	//if we're using an x11 subsystem but running in windows then don't feck up... here, at least.
+	#else
+		SDL_SysWMinfo wmInfo;
+		SDL_GetWMInfo(&wmInfo);
+		mainwindow = wmInfo.window; //note that this is usually still null
 	#endif
+	}
+#endif
 
-#if SDL_MAJOR_VERSION >= 2
+#if SDL_VERSION_ATLEAST(2,0,0)
 	rf->VID_CreateCursor = GLVID_CreateCursor;
 	rf->VID_DestroyCursor = GLVID_DestroyCursor;
 	rf->VID_SetCursor = GLVID_SetCursor;
@@ -643,7 +661,7 @@ void GLVID_DeInit (void)
 	IN_DeactivateMouse();
 
 
-#if SDL_MAJOR_VERSION >= 2
+#if SDL_VERSION_ATLEAST(2,0,0)
 	SDL_SetWindowGammaRamp(sdlwindow, NULL, NULL, NULL);
 
 	switch(qrenderer)
@@ -680,7 +698,7 @@ void GLVID_SwapBuffers (void)
 	{
 #ifdef OPENGL_SDL
 	case QR_OPENGL:
-#if SDL_MAJOR_VERSION >= 2
+#if SDL_VERSION_ATLEAST(2,0,0)
 		if (vid_vsync.modified)
 		{
 			if (*vid_vsync.string)
@@ -721,7 +739,7 @@ void GLVID_SwapBuffers (void)
 
 qboolean GLVID_ApplyGammaRamps (unsigned int gammarampsize, unsigned short *ramps)
 {
-#if SDL_MAJOR_VERSION >= 2
+#if SDL_VERSION_ATLEAST(2,0,0)
 	if (ramps && gammarampsize == 256)
 	{
 		switch(vid_hardwaregamma.ival)
@@ -777,7 +795,7 @@ qboolean GLVID_ApplyGammaRamps (unsigned int gammarampsize, unsigned short *ramp
 
 void GLVID_SetCaption(const char *text)
 {
-#if SDL_MAJOR_VERSION >= 2
+#if SDL_VERSION_ATLEAST(2,0,0)
 	SDL_SetWindowTitle(sdlwindow, text);
 #else
 	SDL_WM_SetCaption(text, NULL);
diff --git a/engine/gl/gl_vidwayland.c b/engine/gl/gl_vidwayland.c
index 541b3e627..4b410c0b6 100644
--- a/engine/gl/gl_vidwayland.c
+++ b/engine/gl/gl_vidwayland.c
@@ -47,7 +47,9 @@ extern cvar_t vid_conautoscale;
 //protocol names...
 #define WP_POINTER_CONSTRAINTS_NAME "zwp_pointer_constraints_v1"
 #define WP_RELATIVE_POINTER_MANAGER_NAME "zwp_relative_pointer_manager_v1"
-#define ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_NAME "org_kde_kwin_server_decoration_manager" //comment out to disable once XDG_SHELL_DESKTOP
+#define ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_NAME "org_kde_kwin_server_decoration_manager" //comment out to disable once the XDG version is tested.
+//FIXME: needs testing. #define XDG_DECORATION_MANAGER_NAME "zxdg_decoration_manager_v1"
+
 //#define XDG_SHELL_UNSTABLE
 #ifdef XDG_SHELL_UNSTABLE
 #define XDG_SHELL_NAME "zxdg_shell_v6"
@@ -351,6 +353,10 @@ static struct wdisplay_s
 	qboolean waylandisblocking;
 
 	//belated sanity stuff
+#ifdef XDG_DECORATION_MANAGER_NAME
+	struct zxdg_toplevel_decoration_v1 *xdg_decoration;
+	struct zxdg_decoration_manager_v1 *xdg_decoration_manager;
+#endif
 #ifdef ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_NAME
 	struct org_kde_kwin_server_decoration *kwin_decoration;
 	struct org_kde_kwin_server_decoration_manager *kwin_decoration_manager;
@@ -1226,7 +1232,8 @@ static const struct wl_seat_listener seat_listener =
 };
 
 
-#if 0
+#ifdef XDG_DECORATION_MANAGER_NAME
+static const struct wl_interface *pzxdg_toplevel_decoration_v1_interface;
 static void WL_BindDecorationManager(struct wl_registry *registry, uint32_t id)
 {	/*oh hey, I wrote lots of code! pay me more! fuck that shit.*/
 	static const struct wl_interface *types[3];
@@ -1257,9 +1264,34 @@ static void WL_BindDecorationManager(struct wl_registry *registry, uint32_t id)
 	types[1] = &zxdg_toplevel_decoration_v1_interface;
 	types[2] = pxdg_toplevel_interface;
 
-//	pzxdg_toplevel_decoration_v1_interface = &zxdg_toplevel_decoration_v1_interface;
-	w.decoration_manager = pwl_registry_bind(registry, id, &zxdg_decoration_manager_v1_interface, 1);
+	pzxdg_toplevel_decoration_v1_interface = &zxdg_toplevel_decoration_v1_interface;
+	w.xdg_decoration_manager = pwl_registry_bind(registry, id, &zxdg_decoration_manager_v1_interface, 1);
 }
+
+enum xdg_decoration_manager_mode {
+    ZXDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE = 1,
+    ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE = 2,
+};
+#define ZXDG_DECORATION_MANAGER_V1_GET_TOPLEVEL_DECORATION 1
+static inline struct zxdg_toplevel_decoration_v1 *zxdg_decoration_manager_v1_get_toplevel_decoration(struct zxdg_decoration_manager_v1 *zxdg_decoration_manager_v1, struct xdg_toplevel *toplevel)		{ return (struct zxdg_toplevel_decoration_v1 *) pwl_proxy_marshal_constructor((struct wl_proxy *) zxdg_decoration_manager_v1, ZXDG_DECORATION_MANAGER_V1_GET_TOPLEVEL_DECORATION, pzxdg_toplevel_decoration_v1_interface, NULL, toplevel); }
+
+#define ZXDG_TOPLEVEL_DECORATION_V1_SET_MODE 1
+struct zxdg_toplevel_decoration_v1_listener {
+    void (*configure)(void *data, struct zxdg_toplevel_decoration_v1 *zxdg_toplevel_decoration_v1, uint32_t mode);
+};
+static inline void zxdg_toplevel_decoration_v1_set_mode(struct zxdg_toplevel_decoration_v1 *xdg_decoration, uint32_t mode)		{ pwl_proxy_marshal((struct wl_proxy *) xdg_decoration, ZXDG_TOPLEVEL_DECORATION_V1_SET_MODE, mode); }
+static inline int zxdg_toplevel_decoration_v1_add_listener(struct zxdg_toplevel_decoration_v1 *zxdg_toplevel_decoration_v1, const struct zxdg_toplevel_decoration_v1_listener *listener, void *data)	{ return pwl_proxy_add_listener((struct wl_proxy *) zxdg_toplevel_decoration_v1, (void (**)(void)) listener, data); }
+
+static void xdg_decoration_mode(void *data, struct zxdg_toplevel_decoration_v1 *xdg_decoration, uint32_t mode)
+{
+	struct wdisplay_s *d = data;
+	d->hasssd = (mode != ZXDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE);
+}
+static const struct zxdg_toplevel_decoration_v1_listener myxdg_decoration_listener =
+{
+	xdg_decoration_mode
+};
+
 #endif
 
 #ifdef ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_NAME
@@ -1344,6 +1376,10 @@ Con_DLPrintf(0, "Wayland Interface %s id %u version %u\n", interface, id, versio
 		d->seat = pwl_registry_bind(registry, id, pwl_seat_interface, 1);
 		pwl_seat_add_listener(d->seat, &seat_listener, d);
 	}
+#ifdef XDG_DECORATION_MANAGER_NAME
+	else if (strcmp(interface, XDG_DECORATION_MANAGER_NAME) == 0)
+		WL_BindDecorationManager(registry, id);
+#endif
 #ifdef ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_NAME
 	else if (strcmp(interface, ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_NAME) == 0)
 		WL_BindKWinDecorationManager(registry, id);
@@ -1634,6 +1670,20 @@ static qboolean WL_Init (rendererstate_t *info, unsigned char *palette)
 	}
 
 	WL_SetCaption("FTE Quake");
+#ifdef XDG_DECORATION_MANAGER_NAME
+	if (w.xdg_decoration_manager)
+	{	//decorate it!
+		w.xdg_decoration = zxdg_decoration_manager_v1_get_toplevel_decoration(w.xdg_decoration_manager, w.xdg_toplevel);
+		if (w.xdg_decoration)
+		{
+			zxdg_toplevel_decoration_v1_add_listener(w.xdg_decoration, &myxdg_decoration_listener, &w);
+			zxdg_toplevel_decoration_v1_set_mode(w.xdg_decoration, ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
+		}
+	}
+#endif
+#if defined(XDG_DECORATION_MANAGER_NAME) && defined(ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_NAME)
+	else
+#endif
 #ifdef ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_NAME
 	if (w.kwin_decoration_manager)
 	{	//decorate it!
@@ -1865,6 +1915,31 @@ rendererinfo_t rendererinfo_wayland_gl =
 #endif
 
 #ifdef VKQUAKE
+static qboolean WLVK_EnumerateDevices(void *usercontext, void(*callback)(void *context, const char *devicename, const char *outputname, const char *desc))
+{
+	qboolean ret = false;
+#ifdef VK_NO_PROTOTYPES
+	PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr;
+	void *lib = NULL;
+	dllfunction_t func[] =
+	{
+		{(void*)&vkGetInstanceProcAddr,		"vkGetInstanceProcAddr"},
+		{NULL,							NULL}
+	};
+
+	if (!lib)
+		lib = Sys_LoadLibrary("libvulkan.so.1", func);
+	if (!lib)
+		lib = Sys_LoadLibrary("libvulkan.so", func);
+	if (!lib)
+		return false;
+#endif
+	ret = VK_EnumerateDevices(usercontext, callback, "Vulkan-Wayland-", vkGetInstanceProcAddr);
+#ifdef VK_NO_PROTOTYPES
+	Sys_CloseLibrary(lib);
+#endif
+	return ret;
+}
 rendererinfo_t rendererinfo_wayland_vk =
 {
     "Vulkan (Wayland)",
@@ -1924,7 +1999,9 @@ rendererinfo_t rendererinfo_wayland_vk =
     VKBE_RenderToTextureUpdate2d,
 
     "",
-	WL_GetPriority
+	WL_GetPriority,
+	NULL,
+	WLVK_EnumerateDevices
 };
 #endif
 
diff --git a/engine/gl/ltface.c b/engine/gl/ltface.c
index 13b230dd7..e7783cbae 100644
--- a/engine/gl/ltface.c
+++ b/engine/gl/ltface.c
@@ -125,21 +125,39 @@ static void ParseEpair (mentity_t *mapent, char *key, char *value)
 	}
 }
 
-void LightShutdown(struct relight_ctx_s *ctx)
+void LightShutdown(struct relight_ctx_s *ctx, model_t *model)
 {
-	Z_Free(ctx->entities);
-	Z_Free(ctx);
+	unsigned int u;
+	for (u = 0; u < ctx->nummodels; u++)
+		if (ctx->models[u] == model)
+		{
+			if (u < ctx->nummodels-1)	//swap it out.
+				ctx->models[u] = ctx->models[ctx->nummodels-1];
+			ctx->nummodels -= 1;
+
+			if (ctx->nummodels)
+				return;	//other models still refer to it!
+
+			Z_Free(ctx->entities);
+			Z_Free(ctx);
+			break;
+		}
 }
 struct relight_ctx_s *LightStartup(struct relight_ctx_s *ctx, model_t *model, qboolean shadows, qboolean skiplit)
 {
+	unsigned int u;
 	if (!ctx)
 	{
 		ctx = Z_Malloc(sizeof(*ctx));
 		ctx->shadows = shadows;
 		ctx->skiplit = skiplit;
 	}
-	if (ctx->nummodels < countof(ctx->models))
-		ctx->models[ctx->nummodels++] = model;
+	for (u = 0; u < ctx->nummodels; u++)
+		if (ctx->models[u] == model)
+			break;
+	if (u == ctx->nummodels)
+		if (ctx->nummodels < countof(ctx->models))
+			ctx->models[ctx->nummodels++] = model;
 	ctx->starttime = Sys_DoubleTime();
 	return ctx;
 }
@@ -1127,7 +1145,7 @@ void RelightTerminate(model_t *mod)
 		else
 			Con_Printf("Relighting aborted before completion\n");
 
-		LightShutdown(lightcontext);
+		LightShutdown(lightcontext, mod);
 		lightcontext = NULL;
 	}
 }
diff --git a/engine/gl/r_bishaders.h b/engine/gl/r_bishaders.h
index df8e12318..fec6ee891 100644
--- a/engine/gl/r_bishaders.h
+++ b/engine/gl/r_bishaders.h
@@ -688,8 +688,7 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND
 "n = texture2D(s_normalmap, ntc).xyz - 0.5;\n"
 "#else\n"
 //apply q1-style warp, just for kicks
-"ntc.s = tc.s + sin(tc.t+e_time)*0.125;\n"
-"ntc.t = tc.t + sin(tc.s+e_time)*0.125;\n"
+"ntc = tc + sin(tc.ts+e_time)*0.125;\n"
 
 //generate the two wave patterns from the normalmap
 "n = (texture2D(s_normalmap, vec2(TXSCALE1)*tc + vec2(e_time*0.1, 0.0)).xyz);\n"
@@ -3293,10 +3292,16 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND
 "s = normalize(s);\n"
 "t = normalize(t);\n"
 "#ifndef PBR\n"
+"#ifdef EIGHTBIT\n"
+//doesn't darken in the shade, only gets brighter in the light (overbrighting)
+"light.rgb += max(0.0,dot(n,e_light_dir)) * e_light_mul;\n"
+"#else\n"
+//_DOES_ get darker in the shade, despite the light not lighting it at all....
 "float d = dot(n,e_light_dir);\n"
-"if (d < 0.0)  //vertex shader. this might get ugly, but I don't really want to make it per vertex.\n"
-"d = 0.0; //this avoids the dark side going below the ambient level.\n"
-"light.rgb += (d*e_light_mul);\n"
+"if (d < 0)\n"
+"d *= 13.0/44.0; //a wtfery factor to approximate glquake's anorm_dots.h\n"
+"light.rgb += d * e_light_mul;\n"
+"#endif\n"
 "#else\n"
 "light.rgb = vec3(1.0);\n"
 "#endif\n"
@@ -4894,6 +4899,7 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND
 "!!samps reflectcube\n"
 "!!cvardf r_skyfog=0.5\n"
 "!!cvard4 r_glsl_skybox_orientation=0 0 0 0\n"
+"!!cvardf r_glsl_skybox_autorotate=1\n"
 "#include \"sys/defs.h\"\n"
 "#include \"sys/fog.h\"\n"
 
@@ -4903,10 +4909,12 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND
 "#ifdef VERTEX_SHADER\n"
 "mat3 rotateAroundAxis(vec4 axis) //xyz axis, with angle in w\n"
 "{\n"
-"#define skyang axis.w*(3.14/180.0)*e_time\n"
+"if (bool(r_glsl_skybox_autorotate))\n"
+"axis.w *= e_time;\n"
+"axis.w *= (3.14/180.0);\n"
 "axis.xyz = normalize(axis.xyz);\n"
-"float s = sin(skyang);\n"
-"float c = cos(skyang);\n"
+"float s = sin(axis.w);\n"
+"float c = cos(axis.w);\n"
 "float oc = 1.0 - c;\n"
 
 "return mat3(oc * axis.x * axis.x + c, oc * axis.x * axis.y - axis.z * s, oc * axis.z * axis.x + axis.y * s,\n"
@@ -5855,7 +5863,7 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND
 #endif
 #ifdef D3D11QUAKE
 {QR_DIRECT3D11, 11, "defaultsprite",
-"!!samps diffuse\n"
+"!!samps 1\n"
 
 "struct a2v\n"
 "{\n"
@@ -5913,7 +5921,8 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND
 "!!permu SPECULAR\n"
 "!!permu REFLECTCUBEMASK\n"
 "!!permu FAKESHADOWS\n"
-"!!cvarf r_glsl_offsetmapping_scale\n"
+"!!cvardf r_glsl_offsetmapping_scale\n"
+"!!cvardf r_glsl_emissive=1\n"
 "!!cvardf r_glsl_pcf\n"
 "!!cvardf r_tessellation_level=5\n"
 "!!samps diffuse\n"
@@ -5983,6 +5992,9 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND
 "invsurface = mat3(v_svector, v_tvector, v_normal);\n"
 "#endif\n"
 "tc = v_texcoord;\n"
+"#ifdef FLOWV\n"
+"tc.st += e_time * vec2(FLOWV);\n"
+"#endif\n"
 "#ifdef FLOW\n"
 "tc.s += e_time * -0.5;\n"
 "#endif\n"
@@ -6303,6 +6315,8 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND
 
 "#ifdef REFLECTCUBEMASK\n"
 "vec3 rtc = reflect(normalize(-eyevector), norm);\n"
+//todo: parallax correction: https://seblagarde.wordpress.com/2012/09/29/image-based-lighting-approaches-and-parallax-corrected-cubemap/
+//norm (and also eyevector) are in tangentspace but our cubemap wants worldspace, so convert.
 "rtc = rtc.x*invsurface[0] + rtc.y*invsurface[1] + rtc.z*invsurface[2];\n"
 "rtc = (m_model * vec4(rtc.xyz,0.0)).xyz;\n"
 "col.rgb += texture2D(s_reflectmask, tc).rgb * textureCube(s_reflectcube, rtc).rgb;\n"
@@ -6317,10 +6331,15 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND
 "col.b = texture2D(s_colourmap, vec2(pal, 1.0-lightmaps.b)).b; //without lits, it should be identical.\n"
 "#else\n"
 //now we have our diffuse+specular terms, modulate by lightmap values.
+"#if defined(FULLBRIGHT)\n"
+"vec4 fb = texture2D(s_fullbright, tc);\n"
+"#if r_glsl_emissive==0 //q2e-like mask that gets darker when lights get overbright.\n"
+"col.rgb *= mix(lightmaps.rgb, vec3(1.0), fb.rgb*fb.a);\n"
+"#else //actually emissive layer\n"
+"col.rgb = col.rgb * lightmaps.rgb + fb.rgb*fb.a;\n"
+"#endif\n"
+"#else\n"
 "col.rgb *= lightmaps.rgb;\n"
-//add on the fullbright
-"#ifdef FULLBRIGHT\n"
-"col.rgb += texture2D(s_fullbright, tc).rgb;\n"
 "#endif\n"
 "#endif\n"
 
@@ -7350,6 +7369,9 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND
 "void main ()\n"
 "{\n"
 "tc = v_texcoord.st;\n"
+"#ifdef FLOWV\n"
+"tc.st += e_time * vec2(FLOWV);\n"
+"#endif\n"
 "#ifdef FLOW\n"
 "tc.s += e_time * -0.5;\n"
 "#endif\n"
@@ -7362,9 +7384,7 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND
 "#ifdef FRAGMENT_SHADER\n"
 "void main ()\n"
 "{\n"
-"vec2 ntc;\n"
-"ntc.s = tc.s + sin(tc.t+e_time)*0.125;\n"
-"ntc.t = tc.t + sin(tc.s+e_time)*0.125;\n"
+"vec2 ntc = tc + sin(tc.ts+e_time)*0.125;\n"
 "vec3 ts = vec3(texture2D(s_diffuse, ntc));\n"
 
 "#ifdef LIT\n"
@@ -7727,9 +7747,7 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND
 "sampler s_diffuse;\n"
 "float4 main (v2f inp) : COLOR0\n"
 "{\n"
-"float2 ntc;\n"
-"ntc.x = inp.tc.x + sin(inp.tc.y+e_time)*0.125;\n"
-"ntc.y = inp.tc.y + sin(inp.tc.x+e_time)*0.125;\n"
+"float2 ntc = inp.tc + sin(inp.tc.yx+e_time)*0.125;\n"
 "float3 ts = tex2D(s_diffuse, ntc).xyz;\n"
 
 "#ifdef ALPHA\n"
@@ -7778,10 +7796,8 @@ YOU SHOULD NOT EDIT THIS FILE BY HAND
 "Texture2D t_diffuse;\n"
 "float4 main (v2f inp) : SV_TARGET\n"
 "{\n"
-"float2 ntc;\n"
+"float2 ntc = inp.tc + sin(inp.tc.yx+e_time)*0.125;\n"
 "float4 r;\n"
-"ntc.x = inp.tc.x + sin(inp.tc.y+e_time)*0.125;\n"
-"ntc.y = inp.tc.y + sin(inp.tc.x+e_time)*0.125;\n"
 "r = t_diffuse.Sample(s_diffuse, ntc);\n"
 "#ifdef ALPHA\n"
 "r.a = float(ALPHA);\n"
diff --git a/engine/http/ftpserver.c b/engine/http/ftpserver.c
index 9538c6f7b..041823116 100644
--- a/engine/http/ftpserver.c
+++ b/engine/http/ftpserver.c
@@ -1298,7 +1298,7 @@ iwboolean FTP_ServerThinkForConnection(FTPclient_t *cl)
 			if (!stricmp(mode, "RMD"))
 			{
 				char path[MAX_OSPATH];
-				if (FS_NativePath(resource, FS_GAMEONLY, path, sizeof(path)) && Sys_rmdir(path))
+				if (FS_SystemPath(resource, FS_GAMEONLY, path, sizeof(path)) && Sys_rmdir(path))
 					QueueMessage (cl, "250 Success.\r\n");
 				else
 					QueueMessage (cl, "550 Requested action not taken.\r\n");
diff --git a/engine/http/httpclient.c b/engine/http/httpclient.c
index 432f075d3..89c01e646 100644
--- a/engine/http/httpclient.c
+++ b/engine/http/httpclient.c
@@ -1,7 +1,5 @@
 #include "quakedef.h"
 
-#include "iweb.h"
-
 #include "netinc.h"
 #include "fs.h"
 
@@ -10,9 +8,6 @@ static struct dl_download *activedownloads;
 
 #if defined(FTE_TARGET_WEB)
 
-
-#include "web/ftejslib.h"
-
 vfsfile_t *FSWEB_OpenTempHandle(int f);
 
 static void DL_Cancel(struct dl_download *dl)
@@ -144,7 +139,7 @@ typedef struct cookie_s
 	char *name;
 	char *value;
 } cookie_t;
-cookie_t *cookies;
+static cookie_t *cookies;
 
 
 //set a specific cookie.
@@ -567,7 +562,7 @@ static qboolean HTTP_DL_Work(struct dl_download *dl)
 				if (nl)
 					*nl = '\0';
 				COM_TrimString(msg, trimmed, sizeof(trimmed));
-				Con_Printf("%s: %s %s (%s)\n", dl->url, buffer, trimmed, Location);
+				Con_Printf(S_COLOR_GRAY "%s: %s %s (%s)\n", dl->url, buffer, trimmed, Location);
 				if (!*Location)
 				{
 					Con_Printf("Server redirected to null location\n");
@@ -1676,3 +1671,43 @@ vfsfile_t *VFSPIPE_Open(int refs, qboolean seekable)
 {
 	return VFS_OpenPipeInternal(refs, seekable, NULL, NULL);
 }
+
+static int QDECL VFSPIPE_WriteBytes_Pair(vfsfile_t *f, const void *buffer, int len)
+{
+	f = ((vfspipe_t*)f)->ctx;	//swap to its partner
+	if (!f)	//it got closed...
+		return VFS_ERROR_EOF;
+	return VFSPIPE_WriteBytes(f, buffer, len);	//read it directly.
+}
+static int QDECL VFSPIPE_ReadBytes_Pair(vfsfile_t *f, void *buffer, int len)
+{
+	f = ((vfspipe_t*)f)->ctx;	//swap to its partner
+	if (!f)	//it got closed...
+		return VFS_ERROR_EOF;
+	return VFSPIPE_WriteBytes(f, buffer, len);	//read it directly.
+}
+static qboolean QDECL VFSPIPE_Close_Pair(vfsfile_t *f)
+{
+	vfspipe_t *p = ((vfspipe_t*)f)->ctx;
+	if (p)
+		p->ctx = NULL;	//don't allow writes to a dead pipe...
+	return VFSPIPE_Close(f);
+}
+void VFSPIPE_OpenPair(vfsfile_t *pair[2])
+{
+	pair[0] = VFS_OpenPipeInternal(1, false, NULL, NULL);
+	pair[1] = VFS_OpenPipeInternal(1, false, NULL, NULL);
+
+	//cross-link them
+	((vfspipe_t*)pair[0])->ctx = pair[1];
+	((vfspipe_t*)pair[1])->ctx = pair[0];
+	pair[0]->Close = VFSPIPE_Close_Pair;
+	pair[1]->Close = VFSPIPE_Close_Pair;
+
+	pair[0]->WriteBytes = VFSPIPE_WriteBytes_Pair;
+	pair[1]->WriteBytes = VFSPIPE_WriteBytes_Pair;
+
+
+	pair[0]->ReadBytes = VFSPIPE_ReadBytes_Pair;
+	pair[1]->ReadBytes = VFSPIPE_ReadBytes_Pair;
+}
diff --git a/engine/http/httpserver.c b/engine/http/httpserver.c
index 74c7df054..f502d89ab 100644
--- a/engine/http/httpserver.c
+++ b/engine/http/httpserver.c
@@ -315,6 +315,7 @@ const char *HTTP_RunClient (HTTP_active_connections_t *cl)
 	int localerrno;
 
 	int ammount, wanted;
+	int matchetag;
 
 	switch(cl->mode)
 	{
@@ -400,6 +401,7 @@ const char *HTTP_RunClient (HTTP_active_connections_t *cl)
 
 		msg = COM_ParseOut(msg, buf2, sizeof(buf2));
 		contentlen = 0;
+		matchetag = 0;
 		if (!strnicmp(buf2, "HTTP/", 5))
 		{
 			if (!strncmp(buf2, "HTTP/1.1", 8))
@@ -478,6 +480,29 @@ const char *HTTP_RunClient (HTTP_active_connections_t *cl)
 							msg++;
 					}
 				}
+				else if (!strnicmp(msg, "If-None-Match:", 14))
+				{
+					msg += 14;
+					while(*msg)
+					{
+						if (*msg == ' ' || *msg == ',')
+							msg++;
+						else if (*msg == '\"')
+						{
+							msg++;
+							matchetag = strtoul(msg, &msg, 16);
+							if (*msg == '\"')
+								msg++;
+							else
+							{
+								matchetag=0;	//something went wrong.
+								break;
+							}
+						}
+						else
+							break;
+					}
+				}
 				else if (!strnicmp(msg, "Transfer-Encoding: ", 18))	//parse needed header fields
 				{
 					cl->closeaftertransaction = true;
@@ -613,26 +638,50 @@ const char *HTTP_RunClient (HTTP_active_connections_t *cl)
 					mimeline = "Content-Type: application/wasm\r\n";
 				else if (strstr(resource, ".js"))
 					mimeline = "Content-Type: text/javascript\r\n";
+//				else if (strstr(resource, ".mvd"))
+//					mimeline = "Content-Type: application/x-multiviewdemo\r\nAccess-Control-Allow-Origin: *\r\n";
+/*
+				else if (strstr(resource, ".fmf"))
+					mimeline = "Content-Type: application/x-multiviewdemo\r\nAccess-Control-Allow-Origin: *\r\n";
+				else if (strstr(resource, ".pak"))
+					mimeline = "Content-Type: application/x-multiviewdemo\r\nAccess-Control-Allow-Origin: *\r\n";
+				else if (strstr(resource, ".pk3"))
+					mimeline = "Content-Type: application/x-multiviewdemo\r\nAccess-Control-Allow-Origin: *\r\n";*/
 				else
 					mimeline = "";
 
 				if (timestamp)
+				{
 					strftime(modifiedline, sizeof(modifiedline), "Last-Modified: %a, %d %b %Y %H:%M:%S GMT\r\n", gmtime(&timestamp));
+					Q_snprintfz(modifiedline+strlen(modifiedline), sizeof(modifiedline)-strlen(modifiedline), "ETag: \"%x\"\r\n", (unsigned int)timestamp);
+				}
+				else if (gzipped)
+					Q_snprintfz(modifiedline+strlen(modifiedline), sizeof(modifiedline)-strlen(modifiedline), "Cache-Control: public, max-age=86400\r\n");
 				else
 					*modifiedline = 0;
 
 				//fixme: add connection: keep-alive or whatever so that ie3 is happy...
-				if (HTTPmarkup>=3)
-					sprintf(resource, "HTTP/1.1 200 OK\r\n"		"%s%s%s"		"Connection: %s\r\n"	"Content-Length: %i\r\n"	"Server: "FULLENGINENAME"/0\r\n"	"\r\n", modifiedline, mimeline, gzipped?"Content-Encoding: gzip\r\nCache-Control: public, max-age=86400\r\n":"", cl->closeaftertransaction?"close":"keep-alive", (int)VFS_GETLEN(cl->file));
+				if (HTTPmarkup >= 3 && matchetag && matchetag==(unsigned int)timestamp)
+				{
+					sprintf(resource, "HTTP/1.1 304 Not Modified\r\n"	"%s%s%s"		"Connection: %s\r\n"	/*"Content-Length: %i\r\n"*/	"Server: "FULLENGINENAME"/0\r\n"	"\r\n", modifiedline, mimeline, gzipped?"Content-Encoding: gzip\r\n":"", cl->closeaftertransaction?"close":"keep-alive"/*, (int)VFS_GETLEN(cl->file)*/);
+					if (cl->file)
+					{	//don't send any actual data...
+						VFS_CLOSE(cl->file);
+						cl->file = NULL;
+					}
+					IWebPrintf("%s:   Not Modified\n", cl->peername);
+				}
+				else if (HTTPmarkup>=3)
+					sprintf(resource, "HTTP/1.1 200 OK\r\n"				"%s%s%s"		"Connection: %s\r\n"	"Content-Length: %i\r\n"	"Server: "FULLENGINENAME"/0\r\n"	"\r\n", modifiedline, mimeline, gzipped?"Content-Encoding: gzip\r\n":"", cl->closeaftertransaction?"close":"keep-alive", (int)VFS_GETLEN(cl->file));
 				else if (HTTPmarkup==2)
-					sprintf(resource, "HTTP/1.0 200 OK\r\n"		"%s%s%s"		"Connection: %s\r\n"	"Content-Length: %i\r\n"	"Server: "FULLENGINENAME"/0\r\n"	"\r\n", modifiedline, mimeline, gzipped?"Content-Encoding: gzip\r\nCache-Control: public, max-age=86400\r\n":"", cl->closeaftertransaction?"close":"keep-alive", (int)VFS_GETLEN(cl->file));
+					sprintf(resource, "HTTP/1.0 200 OK\r\n"				"%s%s%s"		"Connection: %s\r\n"	"Content-Length: %i\r\n"	"Server: "FULLENGINENAME"/0\r\n"	"\r\n", modifiedline, mimeline, gzipped?"Content-Encoding: gzip\r\n":"", cl->closeaftertransaction?"close":"keep-alive", (int)VFS_GETLEN(cl->file));
 				else if (HTTPmarkup)
 					sprintf(resource, "HTTP/0.9 200 OK\r\n\r\n");
 				else
 					strcpy(resource, "");
 				msg = resource;
 
-				if (*mode == 'H' || *mode == 'h')
+				if ((*mode == 'H' || *mode == 'h') && cl->file)
 				{	//'head'
 					VFS_CLOSE(cl->file);
 					cl->file = NULL;
diff --git a/engine/http/iwebiface.c b/engine/http/iwebiface.c
index 681001be7..e372d1d63 100644
--- a/engine/http/iwebiface.c
+++ b/engine/http/iwebiface.c
@@ -5,6 +5,8 @@
 #include "iweb.h"
 #include "netinc.h"
 
+qboolean HTTP_ServerPoll(qboolean httpserverwanted, int portnum);
+
 #ifdef WEBSVONLY	//we need some functions from quake
 
 char *NET_SockadrToString(char *s, int slen, struct sockaddr_qstorage *addr, size_t sizeofaddr)
@@ -827,7 +829,7 @@ qboolean FS_Remove(const char *fname, enum fs_relative relativeto)
 {
 	return false;
 }
-qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out, int outlen)
+qboolean FS_SystemPath(const char *fname, enum fs_relative relativeto, char *out, int outlen)
 {
 	Q_strncpyz(out, fname, outlen);
 	if (*out == '/' || strstr(out, ".."))
diff --git a/engine/qclib/decomp.c b/engine/qclib/decomp.c
index d69378c30..d89826287 100644
--- a/engine/qclib/decomp.c
+++ b/engine/qclib/decomp.c
@@ -13,8 +13,10 @@
 #include <alloca.h>
 #endif
 
-#undef printf
-#define printf GUIprintf
+#define	DEF_H2ARRAY 		(1<<16)	//[-1] is length.
+
+//#undef printf
+//#define printf GUIprintf
 
 #define OP_MARK_END_DO		0x00010000	//do{
 #define OP_MARK_END_ELSE	0x00000400	//}
@@ -68,20 +70,18 @@ const char *GetString(dstring_t str)
 
 extern QCC_opcode_t pr_opcodes [];
 
-int endofsystemfields;
-int debug_offs = 0;
-int assumeglobals = 0;	//unknown globals are assumed to be actual globals and NOT unlocked temps
-int assumelocals = 0;	//unknown locals are assumed to be actual locals and NOT locked temps
+static int debug_offs = 0;
+static int assumeglobals = 0;	//unknown globals are assumed to be actual globals and NOT unlocked temps
+static int assumelocals = 0;	//unknown locals are assumed to be actual locals and NOT locked temps
 
-vfile_t *Decompileofile;
-vfile_t *Decompileprogssrc;
-vfile_t *Decompileprofile;
-char **DecompileProfiles;//[MAX_FUNCTIONS];
+static vfile_t *Decompileofile;
+static vfile_t *Decompileprogssrc;
+static char **DecompileProfiles;//[MAX_FUNCTIONS];
 static char **rettypes;//[MAX_FUNCTIONS];
 
 extern int quakeforgeremap[];
 
-char *type_names[] =
+static char *type_names[] =
 {
 	"void",
 	"string",
@@ -564,7 +564,7 @@ char *ReadProgsCopyright(char *buf, size_t bufsize)
 	return NULL;
 }
 
-int DecompileReadData(char *srcfilename, char *buf, size_t bufsize)
+int DecompileReadData(const char *srcfilename, char *buf, size_t bufsize)
 {
 	dprograms_t progs;
 	int i, j;
@@ -633,12 +633,16 @@ int DecompileReadData(char *srcfilename, char *buf, size_t bufsize)
 
 			if (statements[i].op == OP_IF_I || statements[i].op == OP_IFNOT_I ||
 				statements[i].op == OP_IF_F || statements[i].op == OP_IFNOT_F ||
-				statements[i].op == OP_IF_S || statements[i].op == OP_IFNOT_S)
+				statements[i].op == OP_IF_S || statements[i].op == OP_IFNOT_S ||
+				statements[i].op == OP_CASE || statements[i].op == OP_SWITCH_F)
 				statements[i].b = (signed short)statements6[i].b;
 			else
 				statements[i].b = (unsigned short)statements6[i].b;
 
-			statements[i].c = (unsigned short)statements6[i].c;
+			if (statements[i].op == OP_CASERANGE)
+				statements[i].c = (signed short)statements6[i].c;
+			else
+				statements[i].c = (unsigned short)statements6[i].c;
 		}
 	}
 	else if (stsz == -16)
@@ -656,12 +660,16 @@ int DecompileReadData(char *srcfilename, char *buf, size_t bufsize)
 
 			if (statements[i].op == OP_IF_I || statements[i].op == OP_IFNOT_I ||
 				statements[i].op == OP_IF_F || statements[i].op == OP_IFNOT_F ||
-				statements[i].op == OP_IF_S || statements[i].op == OP_IFNOT_S)
+				statements[i].op == OP_IF_S || statements[i].op == OP_IFNOT_S ||
+				statements[i].op == OP_CASE || statements[i].op == OP_SWITCH_F)
 				statements[i].b = (signed short)statements3[i].b;
 			else
 				statements[i].b = (unsigned short)statements3[i].b;
 
-			statements[i].c = (unsigned short)statements3[i].c;
+			if (statements[i].op == OP_CASERANGE)
+				statements[i].c = (signed short)statements3[i].c;
+			else
+				statements[i].c = (unsigned short)statements3[i].c;
 		}
 	}
 	else
@@ -745,7 +753,7 @@ int DecompileReadData(char *srcfilename, char *buf, size_t bufsize)
 
 	printf("Decompiling...\n");
 	printf("Read Data from %s:\n", srcfilename);
-	printf("Total Size is %6i\n", bufsize);
+	printf("Total Size is %6i\n", (unsigned int)bufsize);
 	printf("Version Code is %i\n", progs.version);
 	printf("CRC is %i\n", progs.crc);
 	printf("%6i strofs\n", strofs);
@@ -847,21 +855,26 @@ int DecompileReadData(char *srcfilename, char *buf, size_t bufsize)
 	return progs.version;
 }
 
-int 
-DecompileGetFunctionIdxByName(const char *name)
+static void DecompileDetermineArrays(void)
 {
-
-	int i;
-
-	for (i = 1; i < numfunctions; i++)
-		if (!strcmp(name, GetString(functions[i].s_name)))
+	int i, j;
+	for (i = 0; i < numstatements; i++)
+	{
+		if (statements[i].op >= OP_FETCH_GBL_F && statements[i].op <= OP_FETCH_GBL_FNC)
 		{
-			return i;
+			for (j = 1; j < numglobaldefs; j++)
+			{
+				if (globals[j].ofs == statements[i].a)
+				{
+					globals[j].type |= DEF_H2ARRAY;
+					break;
+				}
+			}
 		}
-	return 0;
+	}
 }
 
-const etype_t DecompileGetFieldTypeByDef(QCC_ddef_t *def)
+static etype_t DecompileGetFieldTypeByDef(QCC_ddef_t *def)
 {
 	int i;
 	int ofs = ((int*)pr_globals)[def->ofs];
@@ -874,7 +887,7 @@ const etype_t DecompileGetFieldTypeByDef(QCC_ddef_t *def)
 		}
 	return ev_void;
 }
-const char *DecompileGetFieldNameIdxByFinalOffset(int ofs)
+static const char *DecompileGetFieldNameIdxByFinalOffset(int ofs)
 {
 	int i;
 
@@ -1293,7 +1306,7 @@ char *DecompileGlobal(dfunction_t *df, gofs_t ofs, QCC_type_t * req_t)
 	{
 		const char *defname = GetString(def->s_name);
 
-		if (!strcmp(defname, "IMMEDIATE") || !strcmp(defname, ".imm") || !def->s_name)
+		if (!strcmp(defname, "IMMEDIATE") || !strcmp(defname, ".imm") || !strcmp(defname, "I+") || !def->s_name)
 		{
 			etype_t ty;
 			if (!req_t)
@@ -1730,6 +1743,7 @@ void DecompileOpcode(dfunction_t *df, int a, int b, int c, char *opcode, QCC_typ
 	}
 }
 
+static dstatement_t *jumptable;
 void DecompileDecompileStatement(dfunction_t * df, dstatement_t * s, int *indent)
 {
 	static char line[8192];
@@ -1749,6 +1763,35 @@ void DecompileDecompileStatement(dfunction_t * df, dstatement_t * s, int *indent
 	line[0] = '\0';
 	fnam[0] = '\0';
 
+	if (jumptable)
+	{	//FIXME: the default case is the final jump, which will be misordered. flag the statement as needing to check them all or something.
+		//FIXME: we need to push/pop these jumptables when switches are nested.
+		doc = jumptable->op%OP_MARK_END_ELSE;
+		if ((doc == OP_CASE				&& s == jumptable + (signed int)jumptable->b) ||
+			(doc == OP_CASERANGE		&& s == jumptable + (signed int)jumptable->c) ||
+			(doc == OPD_GOTO_DEFAULT	&& s == jumptable + (signed int)jumptable->a))
+		{
+			DecompileIndent(*indent-1);
+			if (doc == OPD_GOTO_DEFAULT)
+				QCC_CatVFile(Decompileofile, "default:\n");
+			else if (doc == OP_CASERANGE)
+			{
+				arg1 = DecompileGet(df, jumptable->a, type_float);
+				arg2 = DecompileGet(df, jumptable->b, type_float);
+				QCC_CatVFile(Decompileofile, "case %s .. %s:\n", arg1, arg2);
+			}
+			else
+			{
+				arg1 = DecompileGet(df, jumptable->a, type_float);
+				QCC_CatVFile(Decompileofile, "case %s:\n", arg1);
+			}
+			jumptable++;
+			doc = jumptable->op%OP_MARK_END_ELSE;
+			if (doc != OP_CASE && doc!= OP_CASERANGE && doc != OPD_GOTO_DEFAULT)
+				jumptable = NULL;
+		}
+	}
+
 	dom = s->op;
 
 	doc = dom / OP_MARK_END_DO;
@@ -1963,8 +2006,8 @@ void DecompileDecompileStatement(dfunction_t * df, dstatement_t * s, int *indent
 		if (parmtype)
 			arg1 = DecompileGet(df, s->a, parmtype);
 		else
-			arg1 = DecompileGet(df, s->a, typ1);
-		arg3 = DecompileGlobal(df, s->b, typ2);
+			arg1 = DecompileGet(df, s->a, typ2);	//types are backwards. *sigh*
+		arg3 = DecompileGlobal(df, s->b, typ1);
 
 		if (arg3)
 		{
@@ -2026,6 +2069,42 @@ void DecompileDecompileStatement(dfunction_t * df, dstatement_t * s, int *indent
 		QC_snprintfz(line, sizeof(line), "random(%s, %s)", arg1, arg2);
 		DecompileImmediate_Insert(df, ofs_return, line, type_float);
 	}
+	else if (OP_RANDV0 == s->op)
+	{
+		DecompileImmediate_Insert(df, ofs_return, "randomv()", type_vector);
+	}
+	else if (OP_RANDV1 == s->op)
+	{
+		arg1 = DecompileGet(df, s->a, typ1);
+		QC_snprintfz(line, sizeof(line), "randomv(%s)", arg1);
+		DecompileImmediate_Insert(df, ofs_return, line, type_vector);
+	}
+	else if (OP_RANDV2 == s->op)
+	{
+		arg1 = DecompileGet(df, s->a, typ1);
+		arg2 = DecompileGet(df, s->b, typ2);
+		QC_snprintfz(line, sizeof(line), "randomv(%s, %s)", arg1, arg2);
+		DecompileImmediate_Insert(df, ofs_return, line, type_vector);
+	}
+	else if (OP_FETCH_GBL_F <= s->op && s->op <= OP_FETCH_GBL_FNC)
+	{
+		if (s->op == OP_FETCH_GBL_F)
+			typ3 = type_float;
+		else if (s->op == OP_FETCH_GBL_V)
+			typ3 = type_vector;
+		else if (s->op == OP_FETCH_GBL_S)
+			typ3 = type_string;
+		else if (s->op == OP_FETCH_GBL_E)
+			typ3 = type_entity;
+		else if (s->op == OP_FETCH_GBL_FNC)
+			typ3 = type_function;
+		else
+			typ3 = NULL;
+		arg1 = DecompileGet(df, s->a, typ1);
+		arg2 = DecompileGet(df, s->b, typ2);
+		QC_snprintfz(line, sizeof(line), "%s[%s]", arg1, arg2);
+		DecompileImmediate_Insert(df, s->c, line, typ3);
+	}
 	else if (pr_opcodes[s->op].flags & OPF_STDUNARY)
 	{
 		arg1 = DecompileGet(df, s->a, typ1);
@@ -2048,9 +2127,9 @@ void DecompileDecompileStatement(dfunction_t * df, dstatement_t * s, int *indent
 
 			typ1 = NULL;
 
-			if (i == 0 && OP_CALL1H <= s->op && s->op <= OP_CALL8H)
+			if (i == 0 && ((OP_CALL1H <= s->op && s->op <= OP_CALL8H) || s->b))
 				j = s->b;
-			else if (i == 1 && OP_CALL1H <= s->op && s->op <= OP_CALL8H)
+			else if (i == 1 && ((OP_CALL1H <= s->op && s->op <= OP_CALL8H) || s->c))
 				j = s->c;
 			else
 				j = ofs_parms[i];
@@ -2260,6 +2339,19 @@ void DecompileDecompileStatement(dfunction_t * df, dstatement_t * s, int *indent
 
 		}
 
+	}
+	else if (s->op == OP_SWITCH_F)
+	{
+		arg1 = DecompileGet(df, s->a, type_float);	//FIXME: this isn't quite accurate...
+		jumptable = s+(signed int)s->b;
+		DecompileIndent(*indent);
+		QCC_CatVFile(Decompileofile, "switch (%s)\n", arg1);
+		DecompileIndent(*indent);
+		QCC_CatVFile(Decompileofile, "{\n");
+		(*indent)++;
+	}
+	else if (s->op == OP_CASE || s->op == OP_CASERANGE || s->op == OPD_GOTO_DEFAULT)
+	{	//shoulda been handled as part of the jumptable handling.
 	}
 	else if (s->op == OPD_GOTO_FORSTART)
 	{
@@ -2275,6 +2367,11 @@ void DecompileDecompileStatement(dfunction_t * df, dstatement_t * s, int *indent
 		DecompileIndent(*indent);
 		QCC_CatVFile(Decompileofile, "} while(1);\n");
 	}
+	else if (s->op == OPD_GOTO_BREAK)
+	{
+		DecompileIndent(*indent);
+		QCC_CatVFile(Decompileofile, "break;\n");
+	}
 	else if (s->op == OP_GOTO)
 	{
 
@@ -2309,6 +2406,14 @@ void DecompileDecompileStatement(dfunction_t * df, dstatement_t * s, int *indent
 		}
 
 	}
+	else if (s->op == OP_THINKTIME)
+	{
+		arg1 = DecompileGet(df, s->a, type_entity);
+		arg2 = DecompileGet(df, s->b, type_float);
+
+		DecompileIndent(*indent);
+		QCC_CatVFile(Decompileofile, "__thinktime %s : %s;\n", arg1, arg2);
+	}
 	else
 	{
 		int op = s->op%OP_MARK_END_ELSE;
@@ -2356,8 +2461,10 @@ pbool DecompileDecompileFunction(dfunction_t * df, dstatement_t *altdone)
 
 	indent = 1;
 
+	jumptable = NULL;
+
 	ds = statements + df->first_statement;
-	if(ds->op == OP_STATE)
+	if(ds->op == OP_STATE || ds->op == OP_CSTATE || ds->op == OP_CWSTATE)
 		ds++;
 	while (1) 
 	{
@@ -2506,7 +2613,7 @@ char *DecompilePrintParameter(QCC_ddef_t * def)
 	{
 		QC_snprintfz(line, sizeof(line), "%s _p_%i%s", type_name(def), def->ofs, debug);
 	}
-	else if (!strcmp(GetString(def->s_name), "IMMEDIATE") || !strcmp(GetString(def->s_name), ".imm"))
+	else if (!strcmp(GetString(def->s_name), "IMMEDIATE") || !strcmp(GetString(def->s_name), ".imm") || !strcmp(GetString(def->s_name), "I+"))
 	{
 		QC_snprintfz(line, sizeof(line), "%s%s", DecompileValueString((etype_t)(def->type), &pr_globals[def->ofs]), debug);
 	}
@@ -2643,6 +2750,8 @@ void DecompilePreceedingGlobals(int start, int end, const char *name)
 	int j;
 	QCC_ddef_t *ef;
 	static char line[8192];
+	char asize[64];
+	int arraysize;
 
 	const char *matchingfield;
 
@@ -2654,12 +2763,20 @@ void DecompilePreceedingGlobals(int start, int end, const char *name)
 
 		if (par)
 		{
+			if (par->type & DEF_H2ARRAY)
+			{
+				arraysize = ((int*)pr_globals)[par->ofs-1]+1;
+				QC_snprintfz(asize, sizeof(asize), "[%i]", arraysize);
+				par->type -= DEF_H2ARRAY;
+			}
+			else
+				arraysize = *asize = 0;
 			if (par->type & DEF_SAVEGLOBAL)
 				par->type -= DEF_SAVEGLOBAL;
 
 			if (par->type == ev_function)
 			{
-				if (strcmp(GetString(par->s_name), "IMMEDIATE") && strcmp(GetString(par->s_name), ".imm"))
+				if (strcmp(GetString(par->s_name), "IMMEDIATE") && strcmp(GetString(par->s_name), ".imm") && strcmp(GetString(par->s_name), "I+"))
 				{
 					if (strcmp(GetString(par->s_name), name))
 					{
@@ -2671,7 +2788,7 @@ void DecompilePreceedingGlobals(int start, int end, const char *name)
 							//happens with void() func = otherfunc;
 							//such functions thus don't have their own type+body
 							*s = 0;
-							QCC_CatVFile(Decompileofile, "var %s %s = %s;\n", DecompileProfiles[f], GetString(par->s_name), s+1);
+							QCC_CatVFile(Decompileofile, "var %s %s%s = %s;\n", DecompileProfiles[f], GetString(par->s_name), asize, s+1);
 							*s = ' ';
 						}
 						else
@@ -2681,7 +2798,7 @@ void DecompilePreceedingGlobals(int start, int end, const char *name)
 			}
 			else if (par->type != ev_pointer)
 			{
-				if (strcmp(GetString(par->s_name), "IMMEDIATE") && strcmp(GetString(par->s_name), ".imm") && par->s_name)
+				if (strcmp(GetString(par->s_name), "IMMEDIATE") && strcmp(GetString(par->s_name), ".imm") && strcmp(GetString(par->s_name), "I+") && par->s_name)
 				{
 
 					if (par->type == ev_field)
@@ -2691,7 +2808,7 @@ void DecompilePreceedingGlobals(int start, int end, const char *name)
 
 						if (!ef)
 						{
-							QCC_CatVFile(Decompileofile, "var .unknowntype %s;\n", GetString(par->s_name));
+							QCC_CatVFile(Decompileofile, "var .unknowntype %s%s;\n", GetString(par->s_name), asize);
 							printf("Fatal Error: Could not locate a field named \"%s\"\n", GetString(par->s_name));
 						}
 						else
@@ -2710,9 +2827,9 @@ void DecompilePreceedingGlobals(int start, int end, const char *name)
 #endif
 							{
 								if (matchingfield)
-									QCC_CatVFile(Decompileofile, "var .%s %s = %s;\n", type_name(ef), GetString(ef->s_name), matchingfield);
+									QCC_CatVFile(Decompileofile, "var .%s %s%s = %s;\n", type_name(ef), GetString(ef->s_name), asize, matchingfield);
 								else
-									QCC_CatVFile(Decompileofile, ".%s %s;\n", type_name(ef), GetString(ef->s_name));
+									QCC_CatVFile(Decompileofile, ".%s %s%s;\n", type_name(ef), GetString(ef->s_name), asize);
 
 //								fprintf(Decompileofile, "//%i %i %i %i\n", ef->ofs, ((int*)pr_globals)[ef->ofs], par->ofs, ((int*)pr_globals)[par->ofs]);
 							}
@@ -2727,25 +2844,43 @@ void DecompilePreceedingGlobals(int start, int end, const char *name)
 						if (par->type == ev_entity || par->type == ev_void)
 						{
 
-							QCC_CatVFile(Decompileofile, "%s %s;\n", type_name(par), GetString(par->s_name));
+							QCC_CatVFile(Decompileofile, "%s %s%s;\n", type_name(par), GetString(par->s_name), asize);
 
 						}
 						else
 						{
 
 							line[0] = '\0';
-							QC_snprintfz(line, sizeof(line), "%s", DecompileValueString((etype_t)(par->type), &pr_globals[par->ofs]));
 
 							if (IsConstant(par))
 							{
-								QCC_CatVFile(Decompileofile, "%s %s    = %s;\n", type_name(par), GetString(par->s_name), line);
+								if (*asize)
+								{
+									int k;
+									QCC_CatVFile(Decompileofile, "%s %s%s    = {", type_name(par), GetString(par->s_name), asize);
+									for (k = 0; k < arraysize; k++)
+										QCC_CatVFile(Decompileofile, "%s%s", DecompileValueString((etype_t)(par->type), &pr_globals[par->ofs+type_size[par->type]*k]), (k+1)==arraysize?"":", ");
+									QCC_CatVFile(Decompileofile, "};\n");
+								}
+								else
+								{
+									QC_snprintfz(line, sizeof(line), "%s", DecompileValueString((etype_t)(par->type), &pr_globals[par->ofs]));
+									QCC_CatVFile(Decompileofile, "%s %s%s    = %s;\n", type_name(par), GetString(par->s_name), asize, line);
+								}
 							}
 							else
 							{
-								if (pr_globals[par->ofs] != 0)
-									QCC_CatVFile(Decompileofile, "%s %s /* = %s */;\n", type_name(par), GetString(par->s_name), line);
+								int k;
+								for (k = 0; k < type_size[par->type]; k++)
+									if (pr_globals[par->ofs+k] != 0)
+										break;
+								if (k != type_size[par->type])
+								{
+									QC_snprintfz(line, sizeof(line), "%s", DecompileValueString((etype_t)(par->type), &pr_globals[par->ofs]));
+									QCC_CatVFile(Decompileofile, "%s %s%s /* = %s */;\n", type_name(par), GetString(par->s_name), asize, line);
+								}
 								else
-									QCC_CatVFile(Decompileofile, "%s %s;\n", type_name(par), GetString(par->s_name), line);
+									QCC_CatVFile(Decompileofile, "%s %s%s;\n", type_name(par), GetString(par->s_name), asize);
 							}
 						}
 					}
@@ -2854,6 +2989,21 @@ void DecompileFunction(const char *name, int *lastglobal)
 				}
 			}
 		}
+		else if (dom == OP_SWITCH_F && (signed int)ds->b > 0)
+		{	//essentially a goto that jumps to the OP_CASE lines. any gotos within that block which jump to the end of those cases are breaks.
+			ts = ds + (signed int)ds->b;
+			for (k = (ds+1); k < ts; k++)
+			{
+				tom = k->op % OP_MARK_END_ELSE;
+				if (tom == OP_GOTO && k+(signed int)k->a > ts)
+					k->op += OPD_GOTO_BREAK-OP_GOTO;
+			}
+			ts->op += OP_MARK_END_ELSE;
+			while ((ts->op%OP_MARK_END_ELSE) == OP_CASE || (ts->op%OP_MARK_END_ELSE) == OP_CASERANGE)
+				ts++;
+			if ((ts->op%OP_MARK_END_ELSE) == OP_GOTO && (signed int)ts->a < 0 && ts+(signed int)ts->a > ds)
+				ts->op += OPD_GOTO_DEFAULT-OP_GOTO;
+		}
 		else if (dom == OP_IFNOT_I || dom == OP_IFNOT_F || dom == OP_IFNOT_S)
 		{
 			// check for pure if 
@@ -2983,6 +3133,25 @@ void DecompileFunction(const char *name, int *lastglobal)
 		free(arg2);
 
 	}
+	else if (ds->op == OP_CSTATE || ds->op == OP_CWSTATE)
+	{
+		pbool backwards = false;
+		char *e1,*e2;
+		char *arg1 = DecompileGet(df, ds->a, type_float);
+		arg2 = DecompileGet(df, ds->b, type_float);
+		if (!arg2)
+		{
+			printf("Fatal Error - No state parameter with offset %i.", ds->b);
+			exit(1);
+		}
+
+		if (strtod(arg1, &e1) > strtod(arg2, &e2) && !*e1 && !*e2)
+			backwards = true;	//doesn't really make any difference, but does trigger an error.
+
+		QCC_CatVFile(Decompileofile, " = [%s%s %s .. %s ]", backwards?"--":"++", (ds->op==OP_CWSTATE)?"(W)":"", arg1, arg2);
+
+		free(arg2);
+	}
 	else
 	{
 		QCC_CatVFile(Decompileofile, " =");
@@ -3040,7 +3209,7 @@ void DecompileFunction(const char *name, int *lastglobal)
 				}
 				else
 				{
-					if (!strcmp(GetString(par->s_name), "IMMEDIATE") || !strcmp(GetString(par->s_name), ".imm"))
+					if (!strcmp(GetString(par->s_name), "IMMEDIATE") || !strcmp(GetString(par->s_name), ".imm") || !strcmp(GetString(par->s_name), "I+"))
 						continue; // immediates don't belong
 
 					if (!GetString(par->s_name))
@@ -3085,8 +3254,8 @@ void DecompileFunction(const char *name, int *lastglobal)
 }
 
 extern pbool safedecomp;
-int fake_name;
-char synth_name[1024]; // fake name part2
+static int fake_name;
+static char synth_name[1024]; // fake name part2
 
 pbool TrySynthName(const char *first)
 {
@@ -3222,7 +3391,7 @@ void DecompileDecompileFunctions(const char *origcopyright)
 	}
 }
 
-void DecompileProgsDat(char *name, void *buf, size_t bufsize)
+void DecompileProgsDat(const char *name, void *buf, size_t bufsize)
 {
 	char *c = ReadProgsCopyright(buf, bufsize);
 	if (c)
@@ -3256,6 +3425,7 @@ void DecompileProgsDat(char *name, void *buf, size_t bufsize)
 	type_invalid = QCC_PR_NewType("invalid", ev_void, false);
 
 	DecompileReadData(name, buf, bufsize);
+	DecompileDetermineArrays();
 	DecompileDecompileFunctions(c);
 
 	printf("Done.\n");
@@ -3308,7 +3478,7 @@ char *DecompileGlobalString(gofs_t ofs)
 		{
 
 			line[0] = '0';
-			if (!strcmp(GetString(def->s_name), "IMMEDIATE") || !strcmp(GetString(def->s_name), ".imm"))
+			if (!strcmp(GetString(def->s_name), "IMMEDIATE") || !strcmp(GetString(def->s_name), ".imm") || !strcmp(GetString(def->s_name), "I+"))
 			{
 				s = PR_ValueString((etype_t)(def->type), &pr_globals[ofs]);
 				QC_snprintfz(line, sizeof(line), "%i(%s)", def->ofs, s);
@@ -3389,3 +3559,95 @@ void DecompilePrintFunction(char *name)
 }
 
 
+pbool qcc_vfiles_changed;
+vfile_t *qcc_vfiles;
+void QCC_CloseAllVFiles(void)
+{
+	vfile_t *f;
+
+	while(qcc_vfiles)
+	{
+		f = qcc_vfiles;
+		qcc_vfiles = f->next;
+
+		free(f->file);
+		free(f);
+	}
+	qcc_vfiles_changed = false;
+}
+vfile_t *QCC_FindVFile(const char *name)
+{
+	vfile_t *f;
+	for (f = qcc_vfiles; f; f = f->next)
+	{
+		if (!strcmp(f->filename, name))
+			return f;
+	}
+	//give it another go, for case
+	for (f = qcc_vfiles; f; f = f->next)
+	{
+		if (!QC_strcasecmp(f->filename, name))
+			return f;
+	}
+	return NULL;
+}
+vfile_t *QCC_AddVFile(const char *name, void *data, size_t size)
+{
+	vfile_t *f = QCC_FindVFile(name);
+	if (!f)
+	{
+		f = malloc(sizeof(vfile_t) + strlen(name));
+		f->next = qcc_vfiles;
+		strcpy(f->filename, name);
+		qcc_vfiles = f;
+	}
+	else
+		free(f->file);
+	f->file = malloc(size);
+	f->type = FT_CODE;
+	memcpy(f->file, data, size);
+	f->size = f->bufsize = size;
+
+	qcc_vfiles_changed = true;
+	return f;
+}
+void QCC_CatVFile(vfile_t *f, const char *fmt, ...)
+{
+	va_list argptr;
+	char msg[65536];
+	size_t n;
+
+	va_start (argptr,fmt);
+	QC_vsnprintf (msg,sizeof(msg)-1, fmt, argptr);
+	va_end (argptr);
+
+	n = strlen(msg);
+	if (f->size+n > f->bufsize)
+	{
+		size_t msize = f->bufsize + n + 8192;
+		f->file = realloc(f->file, msize);
+		f->bufsize = msize;
+	}
+	memcpy((char*)f->file+f->size, msg, n);
+	f->size += n;
+}
+void QCC_InsertVFile(vfile_t *f, size_t pos, const char *fmt, ...)
+{
+	va_list argptr;
+	char msg[65536];
+	size_t n;
+	va_start (argptr,fmt);
+	QC_vsnprintf (msg,sizeof(msg)-1, fmt, argptr);
+	va_end (argptr);
+
+	n = strlen(msg);
+	if (f->size+n > f->bufsize)
+	{
+		size_t msize = f->bufsize + n + 8192;
+		f->file = realloc(f->file, msize);
+		f->bufsize = msize;
+	}
+	memmove((char*)f->file+pos+n, (char*)f->file+pos, f->size-pos);
+	f->size += n;
+	memcpy((char*)f->file+pos, msg, n);
+}
diff --git a/engine/qclib/pr_comp.h b/engine/qclib/pr_comp.h
index 9200d1587..f17dfbef1 100644
--- a/engine/qclib/pr_comp.h
+++ b/engine/qclib/pr_comp.h
@@ -563,6 +563,8 @@ enum qcop_e {
 	//special/fake opcodes used by the decompiler.
 	OPD_GOTO_FORSTART,
 	OPD_GOTO_WHILE1,
+	OPD_GOTO_BREAK,
+	OPD_GOTO_DEFAULT,
 
 	OP_NUMOPS,
 #define OP_BIT_BREAKPOINT 0x8000
diff --git a/engine/qclib/pr_edict.c b/engine/qclib/pr_edict.c
index d6c75e06c..ff5c046bd 100644
--- a/engine/qclib/pr_edict.c
+++ b/engine/qclib/pr_edict.c
@@ -2021,8 +2021,6 @@ char *PDECL PR_SaveEnts(pubprogfuncs_t *ppf, char *buf, size_t *bufofs, size_t b
 #undef AddS
 }
 
-int header_crc;
-
 //if 'general' block is found, this is a compleate state, otherwise, we should spawn entities like
 int PDECL PR_LoadEnts(pubprogfuncs_t *ppf, const char *file, void *ctx, void (PDECL *memoryreset) (pubprogfuncs_t *progfuncs, void *ctx), void (PDECL *entspawned) (pubprogfuncs_t *progfuncs, struct edict_s *ed, void *ctx, const char *entstart, const char *entend), pbool(PDECL *extendedterm)(pubprogfuncs_t *progfuncs, void *ctx, const char **extline))
 {
@@ -2043,7 +2041,6 @@ int PDECL PR_LoadEnts(pubprogfuncs_t *ppf, const char *file, void *ctx, void (PD
 
 	extern edictrun_t tempedict;
 
-	int crc = 1;
 	int entsize = 0;
 	int numents = 0;
 	pbool maphacks = false;
@@ -2172,7 +2169,6 @@ int PDECL PR_LoadEnts(pubprogfuncs_t *ppf, const char *file, void *ctx, void (PD
 
 
 			filename[0] = '\0';
-			header_crc = 0;
 
 			while(1)
 			{
@@ -2183,7 +2179,7 @@ int PDECL PR_LoadEnts(pubprogfuncs_t *ppf, const char *file, void *ctx, void (PD
 				if (!strcmp("filename", qcc_token))	//check key get and save values
 					{file = QCC_COM_Parse(file); strcpy(filename, qcc_token);}
 				else if (!strcmp("crc", qcc_token))
-					{file = QCC_COM_Parse(file); header_crc = atoi(qcc_token);}
+					{file = QCC_COM_Parse(file); /*header_crc = atoi(qcc_token);*/}
 				else if (!strcmp("numbuiltins", qcc_token))	//no longer supported.
 					{file = QCC_COM_Parse(file); /*qcc_token unused*/}
 				else if (qcc_token[0] == '}')	//end of block
@@ -2444,7 +2440,6 @@ int PDECL PR_LoadEnts(pubprogfuncs_t *ppf, const char *file, void *ctx, void (PD
 	}
 	if (resethunk)
 	{
-		header_crc = crc;
 		if (externs->loadcompleate)
 			externs->loadcompleate(entsize);
 
diff --git a/engine/qclib/qcc_pr_comp.c b/engine/qclib/qcc_pr_comp.c
index c98207f25..22c6b651c 100644
--- a/engine/qclib/qcc_pr_comp.c
+++ b/engine/qclib/qcc_pr_comp.c
@@ -894,6 +894,8 @@ QCC_opcode_t pr_opcodes[] =
 
  {0, NULL, "OPD_GOTO_FORSTART"},
  {0, NULL, "OPD_GOTO_WHILE1"},
+ {0, NULL, "OPD_GOTO_BREAK"},
+ {0, NULL, "OPD_GOTO_DEFAULT"},
 
  {0, NULL}
 };
@@ -1382,6 +1384,8 @@ static pbool QCC_OPCodeValidForTarget(qcc_targetformat_t targfmt, unsigned int q
 			return (qcc_targetversion>=5768);
 		if (num >= OP_STOREP_B)	//byte
 			return (qcc_targetversion>=5744);
+		//storep_* offsets 5712
+		//	return (qcc_targetversion>=5744);
 		if (num >= OP_STOREF_V)	//field stores
 			return (qcc_targetversion>=5698);
 		if (num >= OP_IF_F)		//iffloat fixes
@@ -11376,8 +11380,9 @@ QCC_sref_t QCC_LoadFromArray(QCC_sref_t base, QCC_sref_t index, QCC_type_t *t, p
 	int flags;
 	int accel;
 
-	//dp-style opcodes take integer indicies, and thus often need type conversions
-	//h2-style opcodes take float indicies, but have a built in boundscheck that wrecks havoc with vectors and structs (and thus sucks when the types don't match)
+	//1: hexen2's FETCH_GBL opcodes take float indicies, but have a built in boundscheck that wrecks havoc with vectors and structs (and thus sucks when the types don't match)
+	//2: fte's LOADA opcodes use ints without hidden boundcheck (engine will still ensure it reads an actual global), and vectors are not special(needs a separate *3 opcode) so they're struct friendly.
+	//3: dp's GLOAD opcodes -- like fte's but without any offsetting so you need an extra addition.
 
 	if (index.cast->type != ev_float || t->type != base.cast->type)
 		accel = 2;
@@ -11385,9 +11390,9 @@ QCC_sref_t QCC_LoadFromArray(QCC_sref_t base, QCC_sref_t index, QCC_type_t *t, p
 		accel = 1;
 
 	if (accel == 2 && !QCC_OPCodeValid(&pr_opcodes[OP_LOADA_F]))
-		accel = QCC_OPCodeValid(&pr_opcodes[OP_GLOAD_F])&&!base.sym->temp?3:1;
+		accel = QCC_OPCodeValid(&pr_opcodes[OP_GLOAD_F])&&!base.sym->temp?3:1;	//chose best for ints
 	if (accel == 1 && (!base.sym->arraylengthprefix || !QCC_OPCodeValid(&pr_opcodes[OP_FETCH_GBL_F])))
-		accel = QCC_OPCodeValid(&pr_opcodes[OP_LOADA_F])?2:0;
+		accel = QCC_OPCodeValid(&pr_opcodes[OP_LOADA_F])?2:0;	//chose best for floats
 
 	if (accel == 3)
 	{	//dp-style, somewhat annoying.
diff --git a/engine/qclib/qccgui.c b/engine/qclib/qccgui.c
index 9f05b48b6..ca67f614a 100644
--- a/engine/qclib/qccgui.c
+++ b/engine/qclib/qccgui.c
@@ -763,8 +763,8 @@ char finddef[256];
 char greptext[256];
 extern pbool fl_extramargins;
 extern int fl_tabsize;
-extern char enginebinary[MAX_PATH];
-extern char enginebasedir[MAX_PATH];
+extern char enginebinary[MAX_OSPATH];
+extern char enginebasedir[MAX_OSPATH];
 extern char enginecommandline[8192];
 extern QCC_def_t *sourcefilesdefs[];
 extern int sourcefilesnumdefs;
diff --git a/engine/qclib/qccguistuff.c b/engine/qclib/qccguistuff.c
index f6dcfffa0..5d99c2a0e 100644
--- a/engine/qclib/qccguistuff.c
+++ b/engine/qclib/qccguistuff.c
@@ -29,9 +29,6 @@ char enginebinary[MAX_OSPATH];
 char enginebasedir[MAX_OSPATH];
 char enginecommandline[8192];
 
-pbool qcc_vfiles_changed;
-vfile_t *qcc_vfiles;
-
 //for finding symbol keywords
 extern QCC_def_t *sourcefilesdefs[];
 extern int sourcefilesnumdefs;
@@ -1082,94 +1079,3 @@ pbool GenBuiltinsList(char *buffer, int buffersize)
 	buffer[usedbuffer] = 0;
 	return usedbuffer>0;
 }
-
-void QCC_CloseAllVFiles(void)
-{
-	vfile_t *f;
-
-	while(qcc_vfiles)
-	{
-		f = qcc_vfiles;
-		qcc_vfiles = f->next;
-
-		free(f->file);
-		free(f);
-	}
-	qcc_vfiles_changed = false;
-}
-vfile_t *QCC_FindVFile(const char *name)
-{
-	vfile_t *f;
-	for (f = qcc_vfiles; f; f = f->next)
-	{
-		if (!strcmp(f->filename, name))
-			return f;
-	}
-	//give it another go, for case
-	for (f = qcc_vfiles; f; f = f->next)
-	{
-		if (!QC_strcasecmp(f->filename, name))
-			return f;
-	}
-	return NULL;
-}
-vfile_t *QCC_AddVFile(const char *name, void *data, size_t size)
-{
-	vfile_t *f = QCC_FindVFile(name);
-	if (!f)
-	{
-		f = malloc(sizeof(vfile_t) + strlen(name));
-		f->next = qcc_vfiles;
-		strcpy(f->filename, name);
-		qcc_vfiles = f;
-	}
-	else
-		free(f->file);
-	f->file = malloc(size);
-	f->type = FT_CODE;
-	memcpy(f->file, data, size);
-	f->size = f->bufsize = size;
-
-	qcc_vfiles_changed = true;
-	return f;
-}
-void QCC_CatVFile(vfile_t *f, const char *fmt, ...)
-{
-	va_list argptr;
-	char msg[65536];
-	size_t n;
-
-	va_start (argptr,fmt);
-	QC_vsnprintf (msg,sizeof(msg)-1, fmt, argptr);
-	va_end (argptr);
-
-	n = strlen(msg);
-	if (f->size+n > f->bufsize)
-	{
-		size_t msize = f->bufsize + n + 8192;
-		f->file = realloc(f->file, msize);
-		f->bufsize = msize;
-	}
-	memcpy((char*)f->file+f->size, msg, n);
-	f->size += n;
-}
-void QCC_InsertVFile(vfile_t *f, size_t pos, const char *fmt, ...)
-{
-	va_list argptr;
-	char msg[65536];
-	size_t n;
-	va_start (argptr,fmt);
-	QC_vsnprintf (msg,sizeof(msg)-1, fmt, argptr);
-	va_end (argptr);
-
-	n = strlen(msg);
-	if (f->size+n > f->bufsize)
-	{
-		size_t msize = f->bufsize + n + 8192;
-		f->file = realloc(f->file, msize);
-		f->bufsize = msize;
-	}
-	memmove((char*)f->file+pos+n, (char*)f->file+pos, f->size-pos);
-	f->size += n;
-	memcpy((char*)f->file+pos, msg, n);
-}
diff --git a/engine/qclib/qcctui.c b/engine/qclib/qcctui.c
index fd15effed..6bc852447 100644
--- a/engine/qclib/qcctui.c
+++ b/engine/qclib/qcctui.c
@@ -198,11 +198,33 @@ int qcc_wildcmp(const char *wild, const char *string)
 	return !*wild;
 }
 
+void AddSourceFile(const char *parentpath, const char *filename){}	//used in the gui to insert extra stuff into the file list. irrelevant here.
+void compilecb(void){}	//... used in the gui to repaint things while busy, so a pointless stub here.
+static void DoDecompileProgsDat(const char *name, void *blob, size_t blobsize)
+{
+//	extern pbool qcc_vfiles_changed;
+	extern vfile_t *qcc_vfiles;
+	vfile_t *f;
+	DecompileProgsDat(name, blob, blobsize);
 
+	for (f = qcc_vfiles; f; f = f->next)
+	{
+		int h;
+		h = SafeOpenWrite(f->filename, -1);
+		if (h >= 0)
+		{
+			SafeWrite(h, f->file, f->size);
+			SafeClose(h);
+		}
+		else
+			externs->Printf("%s: write failure\n", f->filename);
+	}
+}
 
 static const char *extractonly;	//the file we're looking for
 static pbool extractonlyfound;	//for errors.
 static pbool extractecho;	//print the file to stdout instead of writing it.
+static pbool extractdecomp;	//print the file to stdout instead of writing it.
 static void QCC_FileExtract(const char *name, const void *compdata, size_t compsize, int method, size_t plainsize)
 {
 	if (method < 0)
@@ -228,7 +250,9 @@ static void QCC_FileExtract(const char *name, const void *compdata, size_t comps
 		void *buffer = malloc(plainsize);
 		if (buffer && QC_decode(progfuncs, compsize, plainsize, method, compdata, buffer))
 		{
-			if (extractecho)
+			if (extractdecomp)
+				DoDecompileProgsDat(name, buffer, plainsize);
+			else if (extractecho)
 			{
 				externs->Printf("\n");
 				fwrite(buffer, 1, plainsize, stdout);
@@ -302,7 +326,8 @@ int main (int argc, const char **argv)
 			colours = 0;
 		else if (!strcmp(argv[i], "--color=auto"))
 			colours = 2;
-		else if (!strcmp(argv[i], "-l") ||
+		else if (!strcmp(argv[i], "-d") || //o.O
+				 !strcmp(argv[i], "-l") ||
 				 !strcmp(argv[i], "-x") ||
 				 !strcmp(argv[i], "-p") ||
 				 !strcmp(argv[i], "-z") ||
@@ -343,6 +368,33 @@ int main (int argc, const char **argv)
 		}
 		switch(argv[ziparg][1])
 		{
+		case 'd':	//decompile...
+			{
+				size_t blobsize;
+				void *blob = QCC_ReadFile(argv[ziparg+1], NULL, NULL, &blobsize, false);
+				if (!blob)
+					logprintf("Unable to read %s\n", argv[ziparg+1]);
+				else if (!strncmp(blob, "PACK", 4) || !strncmp(blob, "PK", 2))
+				{	//.pak or .pk3... probably.
+					extractonly = (ziparg+2 < argc)?argv[ziparg+2]:"progs.dat";
+					extractdecomp = true;
+					extractonlyfound = false;
+					QC_EnumerateFilesFromBlob(blob, blobsize, QCC_FileExtract);
+					if (!extractonlyfound)
+						externs->Printf("Unable to find file %s inside %s\n", extractonly, argv[ziparg+1]);
+					else
+						return EXIT_SUCCESS;
+					extractonly = NULL;
+				}
+				else if (blob)
+				{	//directly a .dat
+					DoDecompileProgsDat(argv[ziparg+1], blob, blobsize);
+					free(blob);
+					return EXIT_SUCCESS;
+				}
+				return EXIT_FAILURE;
+			}
+			break;
 		case 'l':	//list all files.
 			{
 				size_t blobsize;
diff --git a/engine/qclib/qcd.h b/engine/qclib/qcd.h
index eac1bff2c..609583a8f 100644
--- a/engine/qclib/qcd.h
+++ b/engine/qclib/qcd.h
@@ -7,7 +7,7 @@ int QC_encodecrc(int len, char *in);
 char *PDECL filefromprogs(pubprogfuncs_t *progfuncs, progsnum_t prnum, const char *fname, size_t *size, char *buffer);
 char *filefromnewprogs(pubprogfuncs_t *progfuncs, const char *prname, const char *fname, size_t *size, char *buffer);//fixme - remove parm 1
 
-void DecompileProgsDat(char *name, void *buf, size_t bufsize);
+void DecompileProgsDat(const char *name, void *buf, size_t bufsize);
 char *ReadProgsCopyright(char *buf, size_t bufsize);
 int GUIprintf(const char *msg, ...);
 void compilecb(void);
diff --git a/engine/server/pr_cmds.c b/engine/server/pr_cmds.c
index 13cc07b8e..d023df9ab 100644
--- a/engine/server/pr_cmds.c
+++ b/engine/server/pr_cmds.c
@@ -835,17 +835,17 @@ void PR_Deinit(void)
 		sv.world.progs = NULL;
 		memset(&gfuncs, 0, sizeof(gfuncs));
 		svprogfuncs=NULL;
-
-		for (i = 0; i < sv.maxlightstyles; i++)
-		{
-			BZ_Free((void*)sv.lightstyles[i].str);
-			sv.lightstyles[i].str = NULL;
-		}
-		BZ_Free(sv.lightstyles);
-		sv.lightstyles = NULL;
-		sv.maxlightstyles = 0;
 	}
 
+	for (i = 0; i < sv.maxlightstyles; i++)
+	{
+		BZ_Free((void*)sv.lightstyles[i].str);
+		sv.lightstyles[i].str = NULL;
+	}
+	BZ_Free(sv.lightstyles);
+	sv.lightstyles = NULL;
+	sv.maxlightstyles = 0;
+
 	World_Destroy(&sv.world);
 
 	//clear out function pointers (so changing game modes cannot lead to confusions)
@@ -2680,6 +2680,8 @@ static void QCBUILTIN PF_sv_registercommand (pubprogfuncs_t *prinst, struct glob
 {
 	const char *str = PR_GetStringOfs(prinst, OFS_PARM0);
 	const char *desc = (prinst->callargc>1)?PR_GetStringOfs(prinst, OFS_PARM1):NULL;
+	if (desc && !*desc)
+		desc = NULL;
 	if (!Cmd_Exists(str))
 		Cmd_AddCommandD(str, PR_ConsoleCommand_f, desc);
 }
@@ -6486,7 +6488,7 @@ char *PF_infokey_Internal (int entnum, const char *key)
 				{
 					certsize = NET_GetConnectionCertificate(svs.sockets, &controller->netchan.remote_address, QCERT_PEERCERTIFICATE, buf, sizeof(buf));
 					if (certsize > 0)
-						Base64_EncodeBlockURI(digest,CalcHash(&hash_sha1, digest, sizeof(digest), buf, certsize), ov, sizeof(ov));
+						Base64_EncodeBlockURI(digest,CalcHash(funcs[i].func, digest, sizeof(digest), buf, certsize), ov, sizeof(ov));
 					break;
 				}
 			}
@@ -7458,6 +7460,7 @@ static void QCBUILTIN PF_builtinsupported (pubprogfuncs_t *prinst, struct global
 //mvdsv builtins.
 void QCBUILTIN PF_ExecuteCommand  (pubprogfuncs_t *prinst, struct globalvars_s *pr_globals)	//83		//void() exec;
 {
+	int osc = svs.spawncount;
 	int old_other, old_self; // mod_consolecmd will be executed, so we need to store this
 
 	old_self = pr_global_struct->self;
@@ -7465,6 +7468,9 @@ void QCBUILTIN PF_ExecuteCommand  (pubprogfuncs_t *prinst, struct globalvars_s *
 
 	Cbuf_Execute();
 
+	if (osc != svs.spawncount)
+		Host_EndGame("PF_ExecuteCommand: gamecode pulled out from under us");
+
 	pr_global_struct->self = old_self;
 	pr_global_struct->other = old_other;
 }
@@ -12016,6 +12022,7 @@ static BuiltinList_t BuiltinList[] = {				//nq	qw		h2		ebfs
 
 	{"memalloc",		PF_memalloc,		0,		0,		0,		384,	D("__variant*(int size)", "Allocate an arbitary block of memory")},
 	{"memfree",			PF_memfree,			0,		0,		0,		385,	D("void(__variant *ptr)", "Frees a block of memory that was allocated with memfree")},
+	{"memcmp",			PF_memcmp,			0,		0,		0,		0,		D("int(__variant *dst, __variant *src, int size, optional int dstoffset, int srcoffset)", "Compares two blocks of memory. Returns 0 if equal.")},
 	{"memcpy",			PF_memcpy,			0,		0,		0,		386,	D("void(__variant *dst, __variant *src, int size, optional int dstoffset, int srcoffset)", "Copys memory from one location to another")},
 	{"memfill8",		PF_memfill8,		0,		0,		0,		387,	D("void(__variant *dst, int val, int size, optional int offset)", "Sets an entire block of memory to a specified value. Pretty much always 0.")},
 	{"memgetval",		PF_memgetval,		0,		0,		0,		388,	D("__variant(__variant *dst, float ofs)", "Looks up the 32bit value stored at a pointer-with-offset.")},
@@ -12293,25 +12300,25 @@ static BuiltinList_t BuiltinList[] = {				//nq	qw		h2		ebfs
 	{"findkeysforcommand_dp",PF_Fixme,		0,		0,		0,		610,	"DEP string(string command, optional float bindmap)"},
 	{"keynumtostring",	PF_Fixme,			0,		0,		0,		609,	D("string(float keynum)", "Converts a qscancode key number into a mostly-human-readable name, matching the bind command.")},	//normal name is for menuqc standard.
 	{"findkeysforcommand",PF_Fixme,			0,		0,		0,		610,	"string(string command, optional float bindmap)"},
-	{"gethostcachevalue",PF_Fixme,			0,		0,		0,		611,	"float(float type)"},
-	{"gethostcachestring",PF_Fixme,			0,		0,		0,		612,	"string(float type, float hostnr)"},
+	{"gethostcachevalue",PF_Fixme,			0,		0,		0,		611,	D("float(float type)", "Obtains one of SLIST_ values.")},
+	{"gethostcachestring",PF_Fixme,			0,		0,		0,		612,	D("string(float fld, float hostnr)", "Reads the value of a serverinfo key from the specified server (up to gethostcachevalue(SLIST_HOSTCACHEVIEWCOUNT)).")},
 	{"parseentitydata",	PF_parseentitydata,	0,		0,		0,		613,	D("float(entity e, string s, optional float offset)", "Reads a single entity's fields into an already-spawned entity. s should contain field pairs like in a saved game: {\"foo1\" \"bar\" \"foo2\" \"5\"}. Returns <=0 on failure, otherwise returns the offset in the string that was read to.")},
 	{"generateentitydata",PF_generateentitydata,0,	0,		0,		0,		D("string(entity e)", "Dumps the entities fields into a string which can later be parsed with parseentitydata.")},
 	{"stringtokeynum",	PF_Fixme,			0,		0,		0,		614,	D("float(string key)", "Returns the qscancode of a key from its name. Names are identical to the bind command. ctrl/shift/alt modifiers are ignored.")},
-	{"stringtokeynum_menu",	PF_Fixme,		0,		0,		0,		614,	"float(string key)"},
-	{"resethostcachemasks",PF_Fixme,		0,		0,		0,		615,	"void()"},
-	{"sethostcachemaskstring",PF_Fixme,		0,		0,		0,		616,	"void(float mask, float fld, string str, float op)"},
-	{"sethostcachemasknumber",PF_Fixme,		0,		0,		0,		617,	"void(float mask, float fld, float num, float op)"},
-	{"resorthostcache",	PF_Fixme,			0,		0,		0,		618,	"void()"},
-	{"sethostcachesort",PF_Fixme,			0,		0,		0,		619,	"void(float fld, float descending)"},
-	{"refreshhostcache",PF_Fixme,			0,		0,		0,		620,	"void(optional float dopurge)"},
-	{"gethostcachenumber",PF_Fixme,			0,		0,		0,		621,	"float(float fld, float hostnr)"},
-	{"gethostcacheindexforkey",PF_Fixme,	0,		0,		0,		622,	"float(string key)"},
-	{"addwantedhostcachekey",PF_Fixme,		0,		0,		0,		623,	"void(string key)"},
-	{"getextresponse",	PF_Fixme,			0,		0,		0,		624,	"string()"},
-	{"netaddress_resolve",PF_netaddress_resolve,0,	0,		0,		625,	"string(string dnsname, optional float defport)"},
+	{"stringtokeynum_menu",	PF_Fixme,		0,		0,		0,		614,	D("float(string key)", "Looks up a single key name in the same way that the bind command would, returning the keycode for that key")},
+	{"resethostcachemasks",PF_Fixme,		0,		0,		0,		615,	D("void()", "Resets filters set by sethostcachemask*")},
+	{"sethostcachemaskstring",PF_Fixme,		0,		0,		0,		616,	D("void(float mask, float fld, string str, float op)", "Adds a filter rule for the server queries.")},
+	{"sethostcachemasknumber",PF_Fixme,		0,		0,		0,		617,	D("void(float mask, float fld, float num, float op)", "sethostcachemaskstring, but with a numeric reference value instead of using string comparisons")},
+	{"resorthostcache",	PF_Fixme,			0,		0,		0,		618,	D("void()", "Reevalutes whether each server should be visible. Resorts servers. server ids passed to gethostcachestring are likely to change, and may become out of bounds.")},
+	{"sethostcachesort",PF_Fixme,			0,		0,		0,		619,	D("void(float fld, float descending)", "Specifies which field to sort the server list by, and whether it should be ascending or descending. You will need to resorthostcache() for this to take effect.")},
+	{"refreshhostcache",PF_Fixme,			0,		0,		0,		620,	D("void(optional float dopurge)", "Starts a new ping sequence")},
+	{"gethostcachenumber",PF_Fixme,			0,		0,		0,		621,	D("float(float fld, float hostnr)", "An alternative to gethostcachestring, for reading numeric values")},
+	{"gethostcacheindexforkey",PF_Fixme,	0,		0,		0,		622,	D("float(string key)", "Obtains a handle to a named key (to avoid string lookups). The return value can be used in place of the fld arg in related builtins")},
+	{"addwantedhostcachekey",PF_Fixme,		0,		0,		0,		623,	D("void(string key)", "Asks the engine to track a custom serverinfo key.")},
+	{"getextresponse",	PF_Fixme,			0,		0,		0,		624,	D("string()", "Stub.")},
+	{"netaddress_resolve",PF_netaddress_resolve,0,	0,		0,		625,	D("string(string dnsname, optional float defport)", "Performs a dna lookup and returns the first result as a string, which could be in a whole range of formats. Also blocks until completion.")},
 	{"getgamedirinfo",	PF_Fixme,			0,		0,		0,		626,	D("string(float n, float prop)", "Queries properties about an indexed gamedir (or -1 for the current gamedir). Returns null strings when out of bounds. Use the GDDI_* constants for the prop arg.")},
-	{"getpackagemanagerinfo",PF_Fixme,		0,		0,		0,		0,		D("string(int n, int prop)", "Queries information about a package from the engine's package manager subsystem. Actions can be taken via the pkg console command.")},
+	{"getpackagemanagerinfo",PF_Fixme,		0,		0,		0,		0,		D("string(int n, int prop)", "Queries information about a package from the engine's package manager subsystem. Actions can be taken via the pkg console command. prop must be one of the GPMI_ constants.")},
 	{"sprintf",			PF_sprintf,			0,		0,		0,		627,	D("string(string fmt, ...)",	"'prints' to a formatted temp-string. Mostly acts as in C, however %d assumes floats (fteqcc has arg checking. Use it.).\ntype conversions: l=arg is an int, h=arg is a float, and will work as a prefix for any float or int representation.\nfloat representations: d=decimal, e,E=exponent-notation, f,F=floating-point notation, g,G=terse float, c=char code, x,X=hex\nother representations: i=int, s=string, S=quoted and marked-up string, v=vector, p=pointer\nso %ld will accept an int arg, while %hi will expect a float arg.\nentities, fields, and functions will generally need to be printed as ints with %i.")},
 	{"getsurfacenumtriangles",PF_getsurfacenumtriangles,0,0,0,		628,	"float(entity e, float s)"},
 	{"getsurfacetriangle",PF_getsurfacetriangle,0,	0,		0,		629,	"vector(entity e, float s, float n)"},
@@ -13443,6 +13450,7 @@ void PR_DumpPlatform_f(void)
 		{"CSQC_InputEvent",			"float(float evtype, float scanx, float chary, float devid)", CS, "Called whenever a key is pressed, the mouse is moved, etc. evtype will be one of the IE_* constants. The other arguments vary depending on the evtype. Key presses are not guarenteed to have both scan and unichar values set at the same time."},
 		{"CSQC_Input_Frame",		"__used void()", CS, "Called just before each time clientcommandframe is updated. You can edit the input_* globals in order to apply your own player inputs within csqc, which may allow you a convienient way to pass certain info to ssqc."},
 		{"CSQC_RendererRestarted",	"void(string rendererdescription)", CS, "Called by the engine after the video was restarted. This serves to notify the CSQC that any render targets that it may have cached were purged, and will need to be regenerated."},
+		{"CSQC_GenerateMaterial",	"string(string shadername)", CS, "Returns the material text to use for the named material, for automatically importing foreign materials."},
 		{"CSQC_ConsoleCommand",		"float(string cmd)", CS, "Called if the user uses any console command registed via registercommand."},
 		{"CSQC_ConsoleLink",		"float(string text, string info)", CS, "Called if the user clicks a ^[text\\infokey\\infovalue^] link. Use infoget to read/check each supported key. Return true if you wish the engine to not attempt to handle the link itself.\nWARNING: link text can potentially come from other players, so be careful about what you allow to be changed."},
 		{"CSQC_Ent_Spawn",			"void(float entnum)", CS, "Clumsily defined function for compat with DP. Should call spawn, set that ent's entnum field, and return the entity inside the 'self' global which will then be used for fllowing Ent_Updates. MUST NOT PARSE ANY NETWORK DATA (which makes it kinda useless)."},
@@ -14028,6 +14036,21 @@ void PR_DumpPlatform_f(void)
 		{"GGDI_ICON",			"const float", CS|MENU, D("The mod's Icon path, ready for drawpic."), GGDI_ICON},
 		{"GGDI_GAMEDIRLIST",	"const float", CS|MENU, D("A semi-colon delimited list of gamedirs that the mod's content can be loaded through."), GGDI_ALLGAMEDIRS},
 
+		{"GPMI_NAME",			"const int", CS|MENU, D("Used with getpackagemanagerinfo. Refers to the package's name."), GPMI_NAME},
+		{"GPMI_CATEGORY",		"const int", CS|MENU, D("Refers to the package's category."), GPMI_CATEGORY},
+		{"GPMI_TITLE",			"const int", CS|MENU, D("The human-readable title of the mod with spaces and things."), GPMI_TITLE},
+		{"GPMI_VERSION",		"const int", CS|MENU, D("The package's version. There may be multiple packages with the same name."), GPMI_VERSION},
+		{"GPMI_DESCRIPTION",	"const int", CS|MENU, D("Fairly long textural description of the package which may include gotchas/warnings and other fairly important info."), GPMI_DESCRIPTION},
+		{"GPMI_LICENSE",		"const int", CS|MENU, D("The approximate name of the license the package is covered by, if known."), GPMI_LICENSE},
+		{"GPMI_AUTHOR",			"const int", CS|MENU, D("Who owns the respective (additional) copyrights."), GPMI_AUTHOR},
+		{"GPMI_WEBSITE",		"const int", CS|MENU, D("Website associated with the third-party package."), GPMI_WEBSITE},
+		{"GPMI_INSTALLED",		"const int", CS|MENU, D("Reports the package's installation status. May be enabled(fully installed and active), present(previously installed, but not currently in use), corrupt(enabling will delete+redownload), pending(queued for installation), or a percentage(currently downloading). If empty means the user does not have a copy nor do they currently intend to install it."), GPMI_INSTALLED},
+		{"GPMI_ACTION",			"const int", CS|MENU, D("The action that will be carried out when a 'pkg apply' command is issued(and confirmed)."), GPMI_ACTION},
+		{"GPMI_AVAILABLE",		"const int", CS|MENU, D("Specifies whether the package may be downloaded."), GPMI_AVAILABLE},
+		{"GPMI_FILESIZE",		"const int", CS|MENU, D("The download size of the package."), GPMI_FILESIZE},
+		{"GPMI_GAMEDIR",		"const int", CS|MENU, D("Which gamedir this package will be installed into."), GPMI_GAMEDIR},
+		{"GPMI_MAPS",			"const int", CS|MENU, D("Retrieves a tokenisable list of map names provided in this package, loadable via `map pkgname:mapname`."), GPMI_MAPS},
+
 		{"CLIENTTYPE_DISCONNECTED","const float", QW|NQ, D("Return value from clienttype() builtin. This entity is a player slot that is currently empty."), CLIENTTYPE_DISCONNECTED},
 		{"CLIENTTYPE_REAL",		"const float", QW|NQ, D("This is a real player, and not a bot."), CLIENTTYPE_REAL},
 		{"CLIENTTYPE_BOT",		"const float", QW|NQ, D("This player slot does not correlate to a real player, any messages sent to this client will be ignored."), CLIENTTYPE_BOT},
@@ -14209,7 +14232,7 @@ void PR_DumpPlatform_f(void)
 	if (!*fname)
 		fname = "fteextensions";
 	fname = va("%s/%s.qc", pr_sourcedir.string, fname);
-	FS_NativePath(fname, FS_GAMEONLY, dbgfname, sizeof(dbgfname));
+	FS_DisplayPath(fname, FS_GAMEONLY, dbgfname, sizeof(dbgfname));
 	FS_CreatePath(fname, FS_GAMEONLY);
 	f = FS_OpenVFS(fname, "wb", FS_GAMEONLY);
 	if (!f)
@@ -14333,7 +14356,7 @@ void PR_DumpPlatform_f(void)
 		VFS_PRINTF(f, "#define DEP_CSQC DEP\n");
 	if (targ&(NQ|QW|H2))
 	{	//DEP_SSQC means deprecated in ssqc only, but NOT in the CSQC.
-		VFS_PRINTF(f,	"#if defined(SSQC)"
+		VFS_PRINTF(f,	"#if defined(SSQC)\n"
 							"\t#define DEP_SSQC DEP\n"
 						"#else\n"
 							"\t#define DEP_SSQC\n"
diff --git a/engine/server/pr_q1qvm.c b/engine/server/pr_q1qvm.c
index 8a608f3a0..795bbfc48 100755
--- a/engine/server/pr_q1qvm.c
+++ b/engine/server/pr_q1qvm.c
@@ -1627,12 +1627,14 @@ static qintptr_t QVM_ReadCmd (void *offset, quintptr_t mask, const qintptr_t *ar
 
 	SV_BeginRedirect(RD_OBLIVION, TL_FindLanguage(""));
 	Cbuf_Execute();
+	if (svs.spawncount != spawncount || sv.state < ss_loading)
+	{
+		SV_EndRedirect();
+		Host_EndGame("QVM_ReadCmd: Map changed after reading");
+	}
 	Q_strncpyz(output, sv_redirected_buf, outputlen);
 	SV_EndRedirect();
 
-	if (svs.spawncount != spawncount || sv.state < ss_loading)
-		Host_EndGame("QVM_ReadCmd: Map changed after reading");
-
 	if (old != RD_NONE)
 		SV_BeginRedirect(old, oldl);
 
@@ -1644,7 +1646,7 @@ Con_DPrintf("PF_readcmd: %s\n%s", s, output);
 
 
 static void QVM_RedirectCmdCallback(struct frameendtasks_s *task)
-{	//called at the end of the frame when there's no qc running
+{	//called at the end of the frame when there's no gamecode running
 	host_client = svs.clients + task->ctxint;
 	if (host_client->state >= cs_connected)
 	{
diff --git a/engine/server/savegame.c b/engine/server/savegame.c
index bc35eba7f..52865663d 100644
--- a/engine/server/savegame.c
+++ b/engine/server/savegame.c
@@ -244,7 +244,7 @@ static qboolean SV_LegacySavegame (const char *savename, qboolean verbose)
 
 	sprintf (name, "%s", savename);
 	COM_RequireExtension (name, ".sav", sizeof(name));	//do NOT allow .pak etc
-	if (!FS_NativePath(name, FS_GAMEONLY, native, sizeof(native)))
+	if (!FS_DisplayPath(name, FS_GAMEONLY, native, sizeof(native)))
 		return false;
 	Con_TPrintf (U8("Saving game to %s...\n"), native);
 	f = FS_OpenVFS(name, "wbp", FS_GAMEONLY);
@@ -982,9 +982,9 @@ void SV_SaveLevelCache(const char *savedir, qboolean dontharmgame)
 #ifdef Q2SERVER
 	if (ge)
 	{
-		char	syspath[256];
+		char	syspath[MAX_OSPATH];
 
-		if (!FS_NativePath(name, FS_GAMEONLY, syspath, sizeof(syspath)))
+		if (!FS_SystemPath(name, FS_GAMEONLY, syspath, sizeof(syspath)))
 			return;
 		ge->WriteLevel(syspath);
 
@@ -1415,7 +1415,7 @@ void SV_Savegame (const char *savename, qboolean mapchange)
 	if (ge)
 	{
 		char syspath[256];
-		if (!FS_NativePath(va("saves/%s/game.gsv", savename), FS_GAMEONLY, syspath, sizeof(syspath)))
+		if (!FS_SystemPath(va("saves/%s/game.gsv", savename), FS_GAMEONLY, syspath, sizeof(syspath)))
 			return;
 		ge->WriteGame(syspath, mapchange);
 		FS_FlushFSHashFull();
diff --git a/engine/server/server.h b/engine/server/server.h
index 979d732da..7e1b004b9 100644
--- a/engine/server/server.h
+++ b/engine/server/server.h
@@ -1161,6 +1161,7 @@ float SV_Frame (void);
 void SV_ReadPacket(void);
 void SV_FinalMessage (char *message);
 void SV_DropClient (client_t *drop);
+void SV_DropClient_ByAddress (netadr_t *addr);
 struct quakeparms_s;
 void SV_Init (struct quakeparms_s *parms);
 void SV_ExecInitialConfigs(char *defaultexec);
@@ -1256,6 +1257,7 @@ void SSV_Send(const char *dest, const char *src, const char *cmd, const char *ms
 qboolean MSV_ClusterLogin(svconnectinfo_t *info);
 void MSV_PollSlaves(void);
 qboolean MSV_ForwardToAutoServer(void);	//forwards console command to a default subserver. ie: whichever one our client is on.
+void MSV_SendCvarChange(cvar_t *var);	//when autooffloading, replicates the client's cvar changes to the server
 void MSV_Status(void);
 void MSV_OpenUserDatabase(void);
 #else
@@ -1265,6 +1267,7 @@ void MSV_OpenUserDatabase(void);
 #define MSV_OpenUserDatabase()
 #define MSV_PollSlaves()
 #define MSV_ForwardToAutoServer() false
+#define MSV_SendCvarChange(v)
 #endif
 
 //
diff --git a/engine/server/sv_ccmds.c b/engine/server/sv_ccmds.c
index 0a519bed5..1fa2927a0 100644
--- a/engine/server/sv_ccmds.c
+++ b/engine/server/sv_ccmds.c
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "pr_common.h"
 #include "fs.h"
+#include "netinc.h"
 
 #ifndef CLIENTONLY
 
@@ -495,6 +496,8 @@ static void SV_MapList_f(void)
 {
 	searchpathfuncs_t *spath = NULL;
 	COM_EnumerateFilesReverse("maps/*.*", ShowMapList, &spath);
+	COM_EnumerateFilesReverse("maps/*/*.*", ShowMapList, &spath);
+	COM_EnumerateFilesReverse("maps/*/*/*.*", ShowMapList, &spath);
 }
 
 static int QDECL CompleteMapList (const char *name, qofs_t flags, time_t mtime, void *parm, searchpathfuncs_t *spath)
@@ -567,7 +570,7 @@ static void SV_Map_c(int argn, const char *partial, struct xcommandargcompletion
 	}
 }
 
-#if defined(HAVE_CLIENT) && defined(WEBCLIENT)
+#ifdef WEBCLIENT
 static char *uri_escape(const char *in, char *out, size_t outsize)
 {
 	static const char *hex = "0123456789ABCDEF";
@@ -591,35 +594,79 @@ static char *uri_escape(const char *in, char *out, size_t outsize)
 	*o = 0;
 	return out;
 }
+static void SV_Map_DownloadCanceled(const char *mapname)
+{
+#ifdef HAVE_SERVER
+	if (SSV_IsSubServer() && !sv.state)	//subservers don't leave defunct servers with no maps lying around.
+		Cbuf_AddText("\nquit\n", RESTRICT_LOCAL);
+	if (isDedicated && !sv.state && !COM_CheckParm("-allowmapless"))
+		SV_Error (CON_ERROR"Couldn't download map %s.", mapname);
+#endif
+#ifdef HAVE_CLIENT
+	SCR_SetLoadingStage(LS_NONE);
+#endif
+}
 static void SV_Map_Downloaded(struct dl_download *dl)
 {
+	char buf[1024];
+#ifdef HAVE_CLIENT
 	SCR_SetLoadingStage(LS_NONE);
+#endif
 	if (dl->status == DL_FINISHED)
 	{
-		char buf[1024];
 		Cbuf_AddText(va("map %s\n", COM_QuotedString(dl->user_ctx, buf, sizeof(buf), false)), RESTRICT_LOCAL);
 	}
 	else
-		Con_Printf("Unable to download\n");
+	{
+		Con_Printf("Unable to download map %s\n", COM_QuotedString(dl->user_ctx, buf, sizeof(buf), false));
+		SV_Map_DownloadCanceled(dl->user_ctx);
+	}
 	Z_Free(dl->user_ctx);
 }
 extern cvar_t cl_download_mapsrc;
+static qboolean SV_Map_DownloadStart(char *mapname/*must be duped*/)
+{
+	char buf[512];
+	struct dl_download *dl = HTTP_CL_Get(va("%s%s.bsp", cl_download_mapsrc.string, uri_escape(mapname, buf, sizeof(buf))), va("maps/%s.bsp", mapname), SV_Map_Downloaded);
+	if (dl)
+	{
+		dl->user_ctx = mapname;
+		DL_CreateThread(dl, NULL, NULL);	//allows it to run at its own rate. yay speedups.
+		return true;
+	}
+	Z_Free(mapname);
+	return false;
+}
+#ifdef HAVE_CLIENT
 static void SV_Map_DownloadPrompted(void *ctx, promptbutton_t buttn)
 {
-	const char *mapname=ctx;
 	if (buttn == PROMPT_YES)
 	{
-		char buf[512];
-		struct dl_download *dl = HTTP_CL_Get(va("%s%s.bsp", cl_download_mapsrc.string, uri_escape(mapname, buf, sizeof(buf))), va("maps/%s.bsp", mapname), SV_Map_Downloaded);
-		if (dl)
-		{
-			dl->user_ctx = ctx;
-			DL_CreateThread(dl, NULL, NULL);	//allows it to run at its own rate. yay speedups.
+		if (SV_Map_DownloadStart(ctx))
 			return;
-		}
+		SV_Map_DownloadCanceled(ctx);
 	}
-	SCR_SetLoadingStage(LS_NONE);
-	Z_Free(ctx);
+	else
+	{
+		SV_Map_DownloadCanceled(ctx);
+		Z_Free(ctx);
+	}
+}
+#endif
+static qboolean SV_Map_DownloadPrompt(const char *mapname)
+{
+#ifdef HAVE_SERVER
+	if (isDedicated)
+	{
+		return SV_Map_DownloadStart(Z_StrDup(mapname));
+	}
+#endif
+#ifdef HAVE_CLIENT
+	Menu_Prompt(SV_Map_DownloadPrompted, Z_StrDup(mapname), va(localtext("Download map %s from "S_COLOR_BLUE "%s" S_COLOR_WHITE"?"), mapname, cl_download_mapsrc.string), "Download", NULL, "Cancel", true);
+	return true;
+#else
+	return false;
+#endif
 }
 #endif
 
@@ -944,15 +991,15 @@ void SV_Map_f (void)
 			{
 #ifdef HAVE_CLIENT
 				SCR_SetLoadingStage(LS_NONE);
+#endif
 #ifdef WEBCLIENT
 				if (*cl_download_mapsrc.string &&
-					!strcmp(cmd, "map") && !startspot &&
-					!isDedicated && Cmd_ExecLevel==RESTRICT_LOCAL && !strchr(level, '.'))
+						!strcmp(cmd, "map") && !startspot &&
+						Cmd_ExecLevel==RESTRICT_LOCAL && !strchr(level, '.'))
 				{
-					Menu_Prompt(SV_Map_DownloadPrompted, Z_StrDup(level), va(localtext("Download map %s from "S_COLOR_BLUE "%s" S_COLOR_WHITE"?"), level, cl_download_mapsrc.string), "Download", NULL, "Cancel", true);
-					return;
+					if (SV_Map_DownloadPrompt(level))
+						return;
 				}
-#endif
 #endif
 
 				// FTE is still a Quake engine so report BSP missing
@@ -2287,14 +2334,39 @@ static void SV_Status_f (void)
 		if (sv_listen_q3.ival) Con_Printf(" Q3");
 #endif
 #ifdef HAVE_DTLS
-		if (net_enable_dtls.ival >= 3)
-			Con_TPrintf(" ^[DTLS-only\\tip\\Insecure clients (those without support for DTLS) will be barred from connecting.^]");
-		else if (net_enable_dtls.ival)
-			Con_TPrintf(" ^[DTLS\\tip\\Clients may optionally connect via DTLS for added security^]");
+		if (svs.sockets && svs.sockets->dtlsfuncs)
+		{
+			if (net_enable_dtls.ival >= 3)
+				Con_TPrintf(" ^[DTLS-only\\tip\\Insecure clients (those without support for DTLS) will be barred from connecting.^]");
+			else if (net_enable_dtls.ival)
+				Con_TPrintf(" ^[DTLS\\tip\\Clients may optionally connect via DTLS for added security^]");
+		}
 #endif
 		Con_Printf("\n");
 #if defined(TCPCONNECT) && !defined(CLIENTONLY)
 		Con_TPrintf("tcp services     :");
+
+		if (svs.sockets)
+		{
+			int i, m;
+			netadr_t	addr[64];
+			struct ftenet_generic_connection_s			*con[sizeof(addr)/sizeof(addr[0])];
+			int			flags[sizeof(addr)/sizeof(addr[0])];
+			const char *params[sizeof(addr)/sizeof(addr[0])];
+			m = NET_EnumerateAddresses(svs.sockets, con, flags, addr, params, sizeof(addr)/sizeof(addr[0]));
+			for (i = 0; i < m; i++)
+			{
+				if (!con[i]->islisten)
+					continue;	//wut?
+				if (addr[i].prot == NP_STREAM)
+					break;
+			}
+			if (i == m)
+			{
+				Con_Printf(S_COLOR_GRAY" <No TCP ports open>\n");
+				break;
+			}
+		}
 #if defined(HAVE_SSL)
 		if (net_enable_tls.ival)
 			Con_TPrintf(" ^[TLS\\tip\\Clients are able to connect with Transport Layer Security for the other services, allowing for the use of tls://, wss:// or https:// schemes when their underlaying protocol is enabled.^]");
@@ -2356,7 +2428,10 @@ static void SV_Status_f (void)
 		if (count!=1)
 			Con_TPrintf("particles        : %i/%i\n", count, MAX_SSPARTICLESPRE);
 	}
-	Con_TPrintf("gamedir          : %s\n", FS_GetGamedir(true));
+	if (!strcmp(FS_GetGamedir(true), InfoBuf_ValueForKey(&svs.info, "*gamedir")))
+		Con_TPrintf("gamedir          : %s\n", FS_GetGamedir(true));
+	else
+		Con_TPrintf("gamedir          : %s"S_COLOR_GRAY" (%s)\n", FS_GetGamedir(true), InfoBuf_ValueForKey(&svs.info, "*gamedir"));
 	if (sv_csqcdebug.ival)
 		Con_TPrintf("csqc debug       : true\n");
 #ifdef MVD_RECORDING
@@ -2872,7 +2947,7 @@ void SV_User_f (void)
 		if (certsize <= 0)
 			strcpy(buf, "<no certificate>");
 		else
-			Base64_EncodeBlockURI(digest,CalcHash(&hash_sha1, digest, sizeof(digest), buf, certsize), buf, sizeof(buf));
+			Base64_EncodeBlockURI(digest,CalcHash(&hash_certfp, digest, sizeof(digest), buf, certsize), buf, sizeof(buf));
 		Con_Printf("fp: %s\n", buf);
 		if (NET_GetConnectionCertificate(svs.sockets, &cl->netchan.remote_address, QCERT_PEERSUBJECT, buf, sizeof(buf)) < 0)
 			strcpy(buf, "<unavailable>");
diff --git a/engine/server/sv_cluster.c b/engine/server/sv_cluster.c
index 2417c8094..d2d50a48a 100644
--- a/engine/server/sv_cluster.c
+++ b/engine/server/sv_cluster.c
@@ -210,6 +210,10 @@ pubsubserver_t *MSV_FindSubServer(unsigned int id)
 
 static void MSV_SendCvars(pubsubserver_t *s)
 {
+	sizebuf_t send;
+	char send_buf[8192];
+
+#if 0
 	extern cvar_t skill, sv_nqplayerphysics, sv_pure, sv_minpitch, sv_maxpitch;
 	cvar_t *cvars[] = {
 		&developer,
@@ -219,9 +223,6 @@ static void MSV_SendCvars(pubsubserver_t *s)
 		&saved1, &saved2, &saved3, &saved4, &savedgamecfg,
 		&sv_nqplayerphysics, &sv_pure, &sv_mintic, &sv_maxtic,
 		&sv_minpitch, &sv_maxpitch};
-
-	sizebuf_t send;
-	char send_buf[8192];
 	size_t v;
 
 	memset(&send, 0, sizeof(send));
@@ -235,6 +236,32 @@ static void MSV_SendCvars(pubsubserver_t *s)
 		MSG_WriteString(&send, cvars[v]->string);
 		MSV_WriteSlave(s, &send);
 	}
+#else
+	extern cvar_group_t *cvar_groups;
+	cvar_group_t *grp;
+	cvar_t *var;
+
+	memset(&send, 0, sizeof(send));
+	send.data = send_buf;
+	send.maxsize = sizeof(send_buf);
+
+	for (grp=cvar_groups ; grp ; grp=grp->next)
+	{
+		for (var=grp->cvars ; var ; var=var->next)
+		{
+			if (var->flags & CVAR_NOSET)
+				continue;	//don't spam errors...
+//			if (var->flags & CVAR_USERCREATED)
+//				continue;
+
+			send.cursize = 2;
+			MSG_WriteByte(&send, ccmd_setcvar);
+			MSG_WriteString(&send, var->name);
+			MSG_WriteString(&send, var->string);
+			MSV_WriteSlave(s, &send);
+		}
+	}
+#endif
 }
 
 static pubsubserver_t *MSV_Link_Server(vfsfile_t *stream, int id, const char *mapname)
@@ -778,6 +805,25 @@ void MSV_SubServerCommand_f(void)
 		Con_Printf("No node for index.\n");
 }
 
+void MSV_SendCvarChange(cvar_t *var)
+{
+	if (var->flags & CVAR_NOSET)
+		return;
+	if (subservers && !subservers->next && sv.state == ss_clustermode)
+	{
+		pubsubserver_t *s = subservers;	//there is only one.
+		sizebuf_t buf;
+		char bufmem[65536];
+		buf.data = bufmem;
+		buf.maxsize = sizeof(bufmem);
+		buf.cursize = 2;
+		buf.packing = SZ_RAWBYTES;
+		MSG_WriteByte(&buf, ccmd_setcvar);
+		MSG_WriteString(&buf, var->name);
+		MSG_WriteString(&buf, var->string);
+		MSV_WriteSlave(s, &buf);
+	}
+}
 qboolean MSV_ForwardToAutoServer(void)
 {
 	pubsubserver_t *s;
@@ -809,7 +855,7 @@ qboolean MSV_ForwardToAutoServer(void)
 		sizebuf_t buf;
 		char bufmem[65536];
 		const char *cmd = Cmd_Argv(0);
-		const char *args = Cmd_Args();;
+		const char *args = Cmd_Args();
 		buf.data = bufmem;
 		buf.maxsize = sizeof(bufmem);
 		buf.cursize = 2;
@@ -1074,7 +1120,7 @@ void MSV_ReadFromSubServer(pubsubserver_t *s)
 				if (svadr.type != NA_INVALID)
 				{	//the client was trying to connect to the cluster master.
 					rmsg = va("fredir\n%s", NET_AdrToString(adrbuf, sizeof(adrbuf), &svadr));
-					Netchan_OutOfBand (NS_SERVER, &cladr, strlen(rmsg), (qbyte *)rmsg);
+					Netchan_OutOfBand (NCF_SERVER, &cladr, strlen(rmsg), (qbyte *)rmsg);
 				}
 			}
 			else
@@ -1763,7 +1809,7 @@ qboolean MSV_ClusterLoginReply(netadr_t *legacyclientredirect, unsigned int serv
 		else
 		{
 			char *s = va("fredir\n%s", NET_AdrToString(tmpbuf, sizeof(tmpbuf), &serveraddr));
-			Netchan_OutOfBand (NS_SERVER, clientaddr, strlen(s), (qbyte *)s);
+			Netchan_OutOfBand (NCF_SERVER, clientaddr, strlen(s), (qbyte *)s);
 			return true;
 		}
 	}
diff --git a/engine/server/sv_ents.c b/engine/server/sv_ents.c
index 2786b95f2..d70df0940 100644
--- a/engine/server/sv_ents.c
+++ b/engine/server/sv_ents.c
@@ -1372,7 +1372,7 @@ static void SVFTE_WriteUpdate(unsigned int bits, entity_state_t *state, sizebuf_
 	if (bits & UF_DRAWFLAGS)
 	{
 		MSG_WriteByte(msg, state->hexen2flags);
-		if ((state->hexen2flags & MLS_MASK) == MLS_ABSLIGHT)
+		if ((state->hexen2flags & MLS_MASK) >= MLS_ADDLIGHT)
 			MSG_WriteByte(msg, state->abslight);
 	}
 	if (bits & UF_TAGINFO)
@@ -2541,6 +2541,11 @@ qboolean Cull_Traceline(float *timestamp, pvscamera_t *cameras, edict_t *seen)
 	vec3_t end, amin, size;
 	int c;
 
+	//don't cull inline models like this. too big, too weird.
+	model_t *mod = sv.world.Get_CModel(&sv.world, seen->v->modelindex);
+	if (mod && *mod->name == '*')
+		return false;
+	//don't cull external models either. unless they're progs/b_*.mdl which SHOULD get culled this way. its awkward okay?
 	if (seen->v->solid == SOLID_BSP)
 		return false;	//bsp ents are never culled this way (typically far too large to care, often with large parts inside walls)
 
@@ -3623,9 +3628,6 @@ void SV_Snapshot_BuildStateQ1(entity_state_t *state, edict_t *ent, client_t *cli
 	if (state->effects & DPEF_LOWPRECISION)
 		state->effects &= ~DPEF_LOWPRECISION;	//we don't support it, nor does dp any more. strip it.
 
-	if (state->effects & EF_FULLBRIGHT)	//wrap the field for fte clients (this is horrible)
-		state->hexen2flags |= MLS_FULLBRIGHT;
-
 	if (ent->v->nextthink>sv.world.physicstime)
 		state->lerpend = ent->v->nextthink;
 
@@ -3697,14 +3699,14 @@ void SV_Snapshot_BuildStateQ1(entity_state_t *state, edict_t *ent, client_t *cli
 			}
 			else if (progstype == PROG_TENEBRAE)
 			{
-				if (state->effects & 16)	//tenebrae's EF_FULLDYNAMIC
+				if (state->effects & TENEBRAEEF_FULLDYNAMIC)	//tenebrae's EF_FULLDYNAMIC
 				{
-					state->effects &= ~16;
+					state->effects &= ~TENEBRAEEF_FULLDYNAMIC;
 					state->lightpflags |= PFLAGS_FULLDYNAMIC;
 				}
-				if (state->effects & 32)	//tenebrae's EF_GREEN
+				if (state->effects & TENEBRAEEF_GREEN)	//tenebrae's EF_GREEN
 				{
-					state->effects &= ~32;
+					state->effects &= ~TENEBRAEEF_GREEN;
 					state->effects |= EF_GREEN;
 				}
 			}
@@ -4200,7 +4202,7 @@ void SV_Snapshot_SetupPVS(client_t *client, pvscamera_t *camera)
 			SV_AddCameraEntity(camera, PROG_TO_EDICT(svprogfuncs, client->edict->xv->view2), NULL);
 	}
 
-	//hack for skyrooms, open up the pvs.
+	//hack for skyrooms, open up the pvs. FIXME: only do this if 'the' viewleaf can see sky.
 	if (sv.skyroom_pos_known)
 		SV_AddCameraEntity(camera, NULL, sv.skyroom_pos);
 }
diff --git a/engine/server/sv_main.c b/engine/server/sv_main.c
index 75028adad..f0e8abb43 100644
--- a/engine/server/sv_main.c
+++ b/engine/server/sv_main.c
@@ -165,7 +165,7 @@ cvar_t	sv_csqc_progname	= CVARAF("sv_csqc_progname", "csprogs.dat", /*dp*/"csqc_
 cvar_t pausable				= CVAR("pausable", "");
 cvar_t sv_banproxies		= CVARD("sv_banproxies", "0", "If enabled, anyone connecting via known proxy software will be refused entry. This should aid with blocking aimbots, but is only reliable for certain public proxies.");
 cvar_t	sv_specprint		= CVARD("sv_specprint", "3",	"Bitfield that controls which player events spectators see when tracking that player.\n&1: spectators will see centerprints.\n&2: spectators will see sprints (pickup messages etc).\n&4: spectators will receive console commands, this is potentially risky.\nIndividual spectators can use 'setinfo sp foo' to limit this setting.");
-cvar_t	sv_protocol				= CVARD("sv_protocol", "", "Specifies which protocol extensions to force. recognised values: csqc");
+cvar_t	sv_protocol				= CVARD("sv_protocol", "", "Specifies which protocol extensions to force. Clients which do not support the named protocols will be kicked. Recognised values: fte1 fte2 csqc.");
 
 //
 // game rules mirrored in svs.info
@@ -308,10 +308,6 @@ void SV_Shutdown (void)
 	InfoBuf_Clear(&svs.info, true);
 	InfoBuf_Clear(&svs.localinfo, true);
 
-#ifdef WEBSERVER
-	IWebShutdown();
-#endif
-
 	COM_BiDi_Shutdown();
 	TL_Shutdown();
 	Memory_DeInit();
@@ -757,6 +753,21 @@ void SV_DropClient (client_t *drop)
 	}
 }
 
+//called when someone's connection goes away.
+void SV_DropClient_ByAddress (netadr_t *addr)
+{	//just flag em, its easier on stack...
+	int i;
+	for (i = 0; i < svs.allocated_client_slots; i++)
+	{
+		if (!svs.clients[i].drop && svs.clients[i].state >= cs_connected)
+			if (NET_CompareAdr(&svs.clients[i].netchan.remote_address, addr))
+			{
+				SV_BroadcastTPrintf (PRINT_HIGH, "%s lost connection\n", svs.clients[i].name);
+				svs.clients[i].drop = true;
+			}
+	}
+}
+
 
 //====================================================================
 
@@ -765,8 +776,8 @@ typedef struct pinnedmessages_s {
 	char setby[64];
 	char message[1024];
 } pinnedmessages_t;
-pinnedmessages_t *pinned;
-qboolean dopinnedload = true;
+static pinnedmessages_t *pinned;
+static qboolean dopinnedload = true;
 void PIN_DeleteOldestMessage(void);
 void PIN_MakeMessage(char *from, char *msg);
 
@@ -920,9 +931,9 @@ int SV_CalcPing (client_t *cl, qboolean forcecalc)
 
 	safeswitch (cl->protocol)
 	{
-#ifdef Q2SERVER
 	case SCP_QUAKE2:
 	case SCP_QUAKE2EX:
+#ifdef Q2SERVER
 		{
 			q2client_frame_t *frame;
 			ping = 0;
@@ -1339,11 +1350,6 @@ static void SVC_GetInfo (const char *challenge, int fullstatus)
 	const char *gamestatus;
 	eval_t *v;
 
-#ifdef NQPROT
-	if (!sv_listen_nq.ival && !sv_listen_dp.ival)
-		return;
-#endif
-
 	for (i=0 ; i<svs.allocated_client_slots ; i++)
 	{
 		cl = &svs.clients[i];
@@ -1475,7 +1481,7 @@ static void SVC_InfoQ2 (void)
 		snprintf (string, sizeof(string), "%16s %8s %2i/%2i\n", hostname.string, svs.name, count, (int)maxclients.value);
 	}
 
-	Netchan_OutOfBandPrint (NS_SERVER, &net_from, "info\n%s", string);
+	Netchan_OutOfBandPrint (NCF_SERVER, &net_from, "info\n%s", string);
 }
 #endif
 
@@ -1648,7 +1654,7 @@ qboolean SVC_GetChallenge (qboolean respond_dp)
 	const qboolean respond_qwoverq3 = false;
 #endif
 
-	//ioq3clchallenge = atoi(Cmd_Argv(1));
+	int ioq3clchallenge = atoi(Cmd_Argv(1));
 	const char *protocols = Cmd_Argv(2);
 	if (*protocols)
 	{
@@ -1670,7 +1676,7 @@ qboolean SVC_GetChallenge (qboolean respond_dp)
 		{
 			COM_ParseOut(com_protocolname.string, oprot,sizeof(oprot));
 			pname = va("print\nGame mismatch: This is a %s server\n", oprot);
-			Netchan_OutOfBand(NS_SERVER, &net_from, strlen(pname), pname);
+			Netchan_OutOfBand(NCF_SERVER, &net_from, strlen(pname), pname);
 			return false;
 		}
 	}
@@ -1733,7 +1739,7 @@ qboolean SVC_GetChallenge (qboolean respond_dp)
 	{
 #ifdef Q3SERVER
 	case GT_QUAKE3:	//q3 servers
-		buf = va("challengeResponse %i", challenge);
+		buf = va("challengeResponse %i %i %i", challenge, ioq3clchallenge, com_protocolversion.ival);
 		break;
 #endif
 #ifdef Q2SERVER
@@ -1861,11 +1867,11 @@ qboolean SVC_GetChallenge (qboolean respond_dp)
 			dp = va("challenge FTE%i", challenge);	//an FTE prefix will cause FTE clients to ignore the packet, to give preference to the qw challenge + protocols
 		else
 			dp = va("challenge %iDP", challenge);	//we still need to add a postfix to prevent it from being interpreted as a Q2 server
-		Netchan_OutOfBand(NS_SERVER, &net_from, strlen(dp)+1, dp);
+		Netchan_OutOfBand(NCF_SERVER, &net_from, strlen(dp)+1, dp);
 	}
 
 	if (respond_std)
-		Netchan_OutOfBand(NS_SERVER, &net_from, over-buf, buf);
+		Netchan_OutOfBand(NCF_SERVER, &net_from, over-buf, buf);
 
 #ifdef QWOVERQ3
 	if (svs.gametype == GT_PROGS || svs.gametype == GT_Q1QVM)
@@ -1901,7 +1907,7 @@ static void VARGS SV_OutOfBandPrintf (int q2, netadr_t *adr, char *format, ...)
 	va_end (argptr);
 
 
-	Netchan_OutOfBand (NS_SERVER, adr, strlen(string), (qbyte *)string);
+	Netchan_OutOfBand (NCF_SERVER, adr, strlen(string), (qbyte *)string);
 }
 static void VARGS SV_OutOfBandTPrintf (int q2, netadr_t *adr, int language, translation_t text, ...)
 {
@@ -1923,7 +1929,7 @@ static void VARGS SV_OutOfBandTPrintf (int q2, netadr_t *adr, int language, tran
 	va_end (argptr);
 
 
-	Netchan_OutOfBand (NS_SERVER, adr, strlen(string), (qbyte *)string);
+	Netchan_OutOfBand (NCF_SERVER, adr, strlen(string), (qbyte *)string);
 }
 #endif
 
@@ -2007,7 +2013,7 @@ void VARGS SV_RejectMessage(enum serverprotocols_e protocol, char *format, ...)
 	}
 	va_end (argptr);
 
-	Netchan_OutOfBand (NS_SERVER, &net_from, len, (qbyte *)string);
+	Netchan_OutOfBand (NCF_SERVER, &net_from, len, (qbyte *)string);
 }
 
 void SV_AcceptMessage(client_t *newcl)
@@ -2088,7 +2094,7 @@ void SV_AcceptMessage(client_t *newcl)
 		break;
 	}
 
-	Netchan_OutOfBand (NS_SERVER, &net_from, len, (qbyte *)string);
+	Netchan_OutOfBand (NCF_SERVER, &net_from, len, (qbyte *)string);
 }
 
 #if !defined(_DEBUG) || defined(_WIN32) || defined(FTE_TARGET_WEB)
@@ -2135,7 +2141,7 @@ void SV_ClientProtocolExtensionsChanged(client_t *client)
 					 | PEXT2_MAXPLAYERS			/*not supporting the extra players is bad*/
 					 | PEXT2_PREDINFO			/*fixes some repdelta issues (especially for nq)*/
 					 | PEXT2_NEWSIZEENCODING	/*more accurate sizes, for awkward mods*/
-					 | PEXT2_INFOBLOBS			/*allows mods to send infoblobs to csqc (for avatar images or whatever)*/
+//					 | PEXT2_INFOBLOBS			/*allows mods to send infoblobs to csqc (for avatar images or whatever)*/
 					 ;
 		}
 		if (!strcasecmp(com_token, "fte1"))
@@ -2637,6 +2643,7 @@ void SV_DoDirectConnect(svconnectinfo_t *fte_restrict info)
 	char		basic[80];
 	qboolean	redirect = false;
 	qboolean	preserveparms = false;
+	unsigned int	ncflags;
 
 #ifdef NQPROT
 	extern cvar_t sv_protocol_nq;
@@ -2759,7 +2766,7 @@ void SV_DoDirectConnect(svconnectinfo_t *fte_restrict info)
 	newcl->fteprotocolextensions2 = info->ftepext2;
 	newcl->ezprotocolextensions1 = info->ezpext1;
 	newcl->protocol = info->protocol;
-	newcl->pextknown = info->ftepext1||info->ftepext2;
+	newcl->pextknown = info->ftepext1||info->ftepext2||info->ezpext1;
 	Q_strncpyz(newcl->guid, info->guid, sizeof(newcl->guid));
 
 //	Con_TPrintf("%s:%s:connect\n", sv.name, NET_AdrToString (adrbuf, sizeof(adrbuf), &adr));
@@ -3114,7 +3121,13 @@ void SV_DoDirectConnect(svconnectinfo_t *fte_restrict info)
 	}
 	newcl->zquake_extensions &= SERVER_SUPPORTED_Z_EXTENSIONS;
 
-	Netchan_Setup (NS_SERVER, &newcl->netchan, &info->adr, info->qport);
+	ncflags = NCF_SERVER;
+	if (info->mtu)
+		ncflags |= NCF_FRAGABLE;
+	if (info->ftepext2&PEXT2_STUNAWARE)
+		ncflags |= NCF_STUNAWARE;
+	Netchan_Setup (ncflags, &newcl->netchan, &info->adr, info->qport,
+					info->mtu?info->mtu:atoi(Info_ValueForKey (info->seat[0].info, "mtu")));
 
 #ifdef HUFFNETWORK
 	if (info->huffcrc)
@@ -3122,37 +3135,6 @@ void SV_DoDirectConnect(svconnectinfo_t *fte_restrict info)
 	else
 #endif
 		newcl->netchan.compresstable = NULL;
-	newcl->netchan.pext_fragmentation = info->mtu?true:false;
-	newcl->netchan.pext_stunaware = !!(info->ftepext2&PEXT2_STUNAWARE);
-	//this is the upper bound of the mtu, if its too high we'll get EMSGSIZE and we'll reduce it.
-	//however, if it drops below newcl->netchan.message.maxsize then we'll start to see undeliverable reliables, which means dropped clients.
-	newcl->netchan.mtu = MAX_DATAGRAM;	//vanilla qw clients are assumed to have an mtu of this size.
-	if (info->mtu >= 300)	//anything smaller is someone being intentionally malicious.
-	{	//if we support application fragmenting, then we can send massive reliables without too much issue
-		newcl->netchan.mtu = info->mtu;
-		newcl->netchan.message.maxsize = sizeof(newcl->netchan.message_buf);
-
-#ifdef HAVE_ICE
-		if (info->adr.type == NA_ICE)
-			newcl->netchan.mtu -= 48+12;	//dtls+sctp overhead
-		else
-#endif
-		if (info->adr.prot == NP_DTLS || info->adr.prot == NP_TLS)
-			newcl->netchan.mtu -= 48;		//dtls overhead
-	}
-	else
-	{	//otherwise we can't fragment the packets, and the only way to honour the mtu is to send less data. yay for more round-trips.
-		int mtu;
-		mtu = atoi(Info_ValueForKey (info->seat[0].info, "mtu"));
-		if (mtu)
-			newcl->netchan.mtu = mtu;	//locked mtu size, because not everyone has a working connection (we need icmp would-fragment responses for mtu detection)
-		else						//if its not set then use some 'safe' fallback.
-			mtu = MAX_BACKBUFLEN;	//MAX_BACKBUFLEN of 1200 is < ipv6 required segment size so should always work for reliables.
-		//enforce some boundaries
-		mtu = bound(512-8, mtu, sizeof(newcl->netchan.message_buf));
-		newcl->netchan.message.maxsize = mtu;
-	}
-	Con_DLPrintf(2, "MTU size: %i - %i\n", newcl->netchan.message.maxsize, newcl->netchan.mtu);
 
 	newcl->protocol = info->protocol;
 #ifdef NQPROT
@@ -3167,11 +3149,12 @@ void SV_DoDirectConnect(svconnectinfo_t *fte_restrict info)
 #endif
 	newcl->datagram.allowoverflow = true;
 	newcl->datagram.data = newcl->datagram_buf;
-	if (info->mtu >= 64)
+	if (newcl->netchan.flags&NCF_FRAGABLE)
 		newcl->datagram.maxsize = sizeof(newcl->datagram_buf);
 	else
 		newcl->datagram.maxsize = MAX_DATAGRAM;
 
+#ifdef Q2SERVER
 	if (newcl->protocol == SCP_QUAKE2EX)
 	{
 		newcl->netchan.netprim =
@@ -3180,6 +3163,7 @@ void SV_DoDirectConnect(svconnectinfo_t *fte_restrict info)
 		newcl->netchan.message.prim = sv.q2multicast[1].prim;
 	}
 	else
+#endif
 	{
 		newcl->netchan.netprim =
 		newcl->datagram.prim =
@@ -4123,7 +4107,7 @@ void SVC_ACK (void)
 				}
 				else
 				{
-					Netchan_OutOfBandPrint(NS_SERVER, &net_from, "realip not accepted. Please stop hacking.\n");
+					Netchan_OutOfBandPrint(NCF_SERVER, &net_from, "realip not accepted. Please stop hacking.\n");
 				}
 				return;
 			}
@@ -4216,7 +4200,7 @@ static qboolean SV_DetectAmplificationDDOS (void)
 					}
 					else	//extend by a smidge...
 						dosattacker[at].timeout += dosattacker_period/(double)dosattacker_limit;
-					return true;
+					return false;
 				}
 				break;
 			}
@@ -4350,7 +4334,7 @@ qboolean SV_ConnectionlessPacket (void)
 
 		if (secure.value)	//FIXME: possible problem for nq clients when enabled
 		{
-			Netchan_OutOfBandTPrintf (NS_SERVER, &net_from, com_language, "%c\nThis server requires client validation.\nPlease use the "FULLENGINENAME" validation program\n", A2C_PRINT);
+			Netchan_OutOfBandTPrintf (NCF_SERVER, &net_from, com_language, "%c\nThis server requires client validation.\nPlease use the "FULLENGINENAME" validation program\n", A2C_PRINT);
 		}
 		else
 		{
@@ -4379,7 +4363,7 @@ qboolean SV_ConnectionlessPacket (void)
 				{
 					//NET_DTLS_Disconnect(svs.sockets, &net_from);
 					if (NET_DTLS_Create(svs.sockets, &net_from, NULL, false))
-						Netchan_OutOfBandPrint(NS_SERVER, &net_from, "dtlsopened");
+						Netchan_OutOfBandPrint(NCF_SERVER, &net_from, "dtlsopened");
 					else
 						SV_RejectMessage (SCP_QUAKEWORLD, "DTLS driver failure.\n");
 				}
@@ -4682,7 +4666,7 @@ qboolean SVNQ_ConnectionlessPacket(void)
 					stricmp(password.string, "none"))
 				{	//make sure we don't get crippled because of being unable to specify the actual password with proquake's stuff.
 					char *e;
-					intmax_t svpass = strtoll(password.string, &e, 0);
+					qintmax_t svpass = strtoll(password.string, &e, 0);
 					if (*e)	//something ain't numeric... hash it so they have a chance of getting it right...
 						svpass = CalcHashInt(&hash_md4, password.string, strlen(password.string));
 					if (passwd != svpass)
@@ -4893,7 +4877,7 @@ void SV_OpenRoute_f(void)
 	{
 		sprintf(data, "\xff\xff\xff\xff%c", S2C_CONNECTION);
 
-		Netchan_OutOfBandPrint(NS_SERVER, &to, "hello");
+		Netchan_OutOfBandPrint(NCF_SERVER, &to, "hello");
 //		NET_SendPacket (strlen(data)+1, data, to);
 	}
 }
@@ -4918,9 +4902,9 @@ void SV_ReadPacket(void)
 			if (ct - lt > 5*1000)
 			{
 				if (*banreason)
-					Netchan_OutOfBandTPrintf(NS_SERVER, &net_from, com_language, "You are banned: %s\n", banreason);
+					Netchan_OutOfBandTPrintf(NCF_SERVER, &net_from, com_language, "You are banned: %s\n", banreason);
 				else
-					Netchan_OutOfBandTPrintf(NS_SERVER, &net_from, com_language, "You are banned\n");
+					Netchan_OutOfBandTPrintf(NCF_SERVER, &net_from, com_language, "You are banned\n");
 			}
 			return;
 		}
@@ -5620,11 +5604,6 @@ float SV_Frame (void)
 		}
 	}
 
-
-#ifdef WEBSERVER
-	IWebRun();
-#endif
-
 #ifdef SV_MASTER
 	if (sv_master.ival)
 		SVM_Think();
@@ -5882,7 +5861,7 @@ void SV_InitLocal (void)
 	static cvar_t qws_buildnum	= CVARF("qws_buildnum",	STRINGIFY(SVNREVISION),	CVAR_NOSET );
 	static cvar_t qws_platform	= CVARF("qws_platform",	PLATFORM "-" ARCH_CPU_POSTFIX,				CVAR_NOSET );
 	static cvar_t qws_builddate	= CVARF("qws_builddate",STRINGIFY(SVNDATE),		CVAR_NOSET );
-	static cvar_t qws_homepage	= CVARF("qws_homepage",	"https://sourceforge.net/projects/fteqw/",		CVAR_NOSET );
+	static cvar_t qws_homepage	= CVARF("qws_homepage",	ENGINEWEBSITE,		CVAR_NOSET );
 	Cvar_Register(&qws_name,		"Server Info");
 	Cvar_Register(&qws_fullname,	"Server Info");
 	Cvar_Register(&qws_version,		"Server Info");
@@ -6503,7 +6482,10 @@ void SV_ArgumentOverrides(void)
 	if (!p)
 		p = COM_CheckParm ("-port");
 	if (p && p < com_argc)
+	{
 		Cvar_Set(Cvar_FindVar("sv_port"), com_argv[p+1]);
+		Cvar_Set(Cvar_FindVar("sv_port_tcp"), com_argv[p+1]);
+	}
 }
 
 void SV_ExecInitialConfigs(char *defaultexec)
@@ -6541,6 +6523,89 @@ void SV_ExecInitialConfigs(char *defaultexec)
 	SV_ArgumentOverrides();
 }
 
+static void SV_StartInitialMap(void)
+{
+	// if a map wasn't specified on the command line, spawn start.map
+	//aliases require that we flush the cbuf in order to actually see the results.
+	if (sv.state == ss_dead && Cmd_AliasExist("dedicated_start", RESTRICT_LOCAL))
+	{
+		Cbuf_AddText("dedicated_start", RESTRICT_LOCAL);	//Q2 feature
+		Cbuf_Execute();
+	}
+	if (sv.state == ss_dead && Cmd_AliasExist("startmap_dm", RESTRICT_LOCAL))
+	{
+		Cbuf_AddText("startmap_dm", RESTRICT_LOCAL);	//DP extension
+		Cbuf_Execute();
+	}
+	if (sv.state == ss_dead && Cmd_AliasExist("startmap_sp", RESTRICT_LOCAL))
+	{
+		Cbuf_AddText("startmap_sp", RESTRICT_LOCAL);	//DP extension
+		Cbuf_Execute();
+	}
+	if (sv.state == ss_dead && COM_FCheckExists("maps/start.bsp"))
+		Cmd_ExecuteString ("map start", RESTRICT_LOCAL);	//regular q1
+#ifdef HEXEN2
+	if (sv.state == ss_dead && COM_FCheckExists("maps/demo1.bsp"))
+		Cmd_ExecuteString ("map demo1", RESTRICT_LOCAL);	//regular h2 sp
+#endif
+#ifdef Q2SERVER
+	if (sv.state == ss_dead && COM_FCheckExists("maps/base1.bsp"))
+		Cmd_ExecuteString ("map base1", RESTRICT_LOCAL);	//regular q2 sp
+#endif
+#ifdef Q3SERVER
+	if (sv.state == ss_dead && COM_FCheckExists("maps/q3dm1.bsp"))
+		Cmd_ExecuteString ("map q3dm1", RESTRICT_LOCAL);	//regular q3 'sp'
+#endif
+#ifdef HLSERVER
+	if (sv.state == ss_dead && COM_FCheckExists("maps/c0a0.bsp"))
+		Cmd_ExecuteString ("map c0a0", RESTRICT_LOCAL);	//regular hl sp
+#endif
+}
+
+static void SV_CheckMapless(int iarg, void *data)
+{	//kills the server if we're dead
+	static int wtf;
+	if (sv.state != ss_dead)
+		return;	//yay, the situation got resolved!
+	else if (HTTP_CL_GetActiveDownloads())
+		;	//we still have hope. check again later.
+	else
+	{
+#ifdef PACKAGEMANAGER
+		if (!FS_GameIsInitialised())
+			wtf = -1;
+		if (wtf == 0)
+		{
+			Cmd_ExecuteString("pkg listenabledsources", RESTRICT_LOCAL);
+			Cmd_ExecuteString("pkg refresh", RESTRICT_LOCAL);
+		}
+		else if (wtf == 1)
+		{
+			Cmd_ExecuteString("pkg upgrade", RESTRICT_LOCAL);
+			Cmd_ExecuteString("pkg apply", RESTRICT_LOCAL);
+		}
+		else if (wtf == 2)
+			Cmd_ExecuteString("fs_restart", RESTRICT_LOCAL);	//just in case...
+		else if (wtf == 3)
+			SV_StartInitialMap();	//we should be fully up and running, so try starting that initial map again.
+		else
+#endif
+		{
+			Cmd_ExecuteString("path", RESTRICT_LOCAL);
+			if (COM_CheckParm("-allowmapless"))
+			{	//this is risky and mustn't be on by default. there's a load of scripts that check for success or w/e, so best to not make them arbitrarily fail.
+				Con_Printf(CON_ERROR"Couldn't load a map. You may need to use the -basedir argument or to install some packages.\n");
+				Con_Printf(CON_ERROR"Use the ^[/fs_changegame^] to select the proper basedir/game, or use the ^[/pkg^] command to install required packages, or ^[/quit^] out\n");
+			}
+			else
+				SV_Error (CON_ERROR"Couldn't load a map. You may need to use the -basedir argument.");
+			return;
+		}
+		wtf++;
+	}
+	Cmd_AddTimer(0.1, SV_CheckMapless, 0, NULL,0);	//we still have hope. check again later.
+}
+
 void SV_Init (quakeparms_t *parms)
 {
 	if (isDedicated)
@@ -6551,7 +6616,6 @@ void SV_Init (quakeparms_t *parms)
 		host_parms = *parms;
 
 		Cvar_Init();
-
 		Memory_Init();
 
 		Sys_Init();
@@ -6589,10 +6653,6 @@ void SV_Init (quakeparms_t *parms)
 
 	SV_InitLocal ();
 
-#ifdef WEBSERVER
-	IWebInit();
-#endif
-
 #ifdef SERVER_DEMO_PLAYBACK
 	SV_Demo_Init();
 #endif
@@ -6623,7 +6683,6 @@ void SV_Init (quakeparms_t *parms)
 			FS_ChangeGame(NULL, true, true);
 
 		Cmd_StuffCmds();
-		Cbuf_Execute ();
 
 		Menu_Download_Update();
 
@@ -6649,48 +6708,8 @@ void SV_Init (quakeparms_t *parms)
 		IPLog_Merge_File("iplog.dat");	//legacy crap, for compat with proquake
 #endif
 
-		// if a map wasn't specified on the command line, spawn start.map
-		//aliases require that we flush the cbuf in order to actually see the results.
-		if (sv.state == ss_dead && Cmd_AliasExist("dedicated_start", RESTRICT_LOCAL))
-		{
-			Cbuf_AddText("dedicated_start", RESTRICT_LOCAL);	//Q2 feature
-			Cbuf_Execute();
-		}
-		if (sv.state == ss_dead && Cmd_AliasExist("startmap_dm", RESTRICT_LOCAL))
-		{
-			Cbuf_AddText("startmap_dm", RESTRICT_LOCAL);	//DP extension
-			Cbuf_Execute();
-		}
-		if (sv.state == ss_dead && Cmd_AliasExist("startmap_sp", RESTRICT_LOCAL))
-		{
-			Cbuf_AddText("startmap_sp", RESTRICT_LOCAL);	//DP extension
-			Cbuf_Execute();
-		}
-		if (sv.state == ss_dead && COM_FCheckExists("maps/start.bsp"))
-			Cmd_ExecuteString ("map start", RESTRICT_LOCAL);	//regular q1
-	#ifdef HEXEN2
-		if (sv.state == ss_dead && COM_FCheckExists("maps/demo1.bsp"))
-			Cmd_ExecuteString ("map demo1", RESTRICT_LOCAL);	//regular h2 sp
-	#endif
-	#ifdef Q2SERVER
-		if (sv.state == ss_dead && COM_FCheckExists("maps/base1.bsp"))
-			Cmd_ExecuteString ("map base1", RESTRICT_LOCAL);	//regular q2 sp
-	#endif
-	#ifdef Q3SERVER
-		if (sv.state == ss_dead && COM_FCheckExists("maps/q3dm1.bsp"))
-			Cmd_ExecuteString ("map q3dm1", RESTRICT_LOCAL);	//regular q3 'sp'
-	#endif
-	#ifdef HLSERVER
-		if (sv.state == ss_dead && COM_FCheckExists("maps/c0a0.bsp"))
-			Cmd_ExecuteString ("map c0a0", RESTRICT_LOCAL);	//regular hl sp
-	#endif
-
-		if (sv.state == ss_dead)
-		{
-			Cmd_ExecuteString("path", RESTRICT_LOCAL);
-			SV_Error ("Couldn't load a map. You may need to use the -basedir argument.");
-		}
-
+		SV_StartInitialMap();
+		SV_CheckMapless(0,NULL);	//restarts a timer, kill the server only when the pending downloads have ended.
 	}
 }
 
diff --git a/engine/server/sv_master.c b/engine/server/sv_master.c
index 8206ef342..4ec5fa012 100644
--- a/engine/server/sv_master.c
+++ b/engine/server/sv_master.c
@@ -209,7 +209,9 @@ qboolean SVM_FixupServerAddress(netadr_t *adr, struct dtlspeercred_s *cred)
 		cred->hash = &hash_sha2_512;
 	else
 		return false;	//just no.
-	memset(cred->digest+b, 0, cred->hash->digestsize-b); //make sure its -terminated, in case the provided size was wrong
+	if (b > cred->hash->digestsize)
+		return false;	//err...
+	memset(cred->digest+b, 0, cred->hash->digestsize-b); //make sure its 0-terminated, in case the provided size was wrong
 	return true;
 }
 
@@ -833,8 +835,8 @@ vfsfile_t *SVM_Generate_Rawlist(const char **mimetype, const char *masteraddr, c
 			prot = va("%i", server->protover);
 		if (server->brokerid)
 			VFS_PRINTF(f, "rtc://%s/%s \\protocol\\%s\\maxclients\\%u\\clients\\%u\\bots\\%u\\hostname\\%s\\modname\\%s\\mapname\\%s\\needpass\\%i\n", masteraddr, server->brokerid, prot, server->maxclients, server->clients, server->bots, *server->hostname?server->hostname:"unnamed", *server->gamedir?server->gamedir:"-", *server->mapname?server->mapname:"-", server->needpass?1:0);
-		else if ((fp = Info_ValueForKey(server->rules, "*fp")))
-			VFS_PRINTF(f, "rtc://%s/udp/%s \\protocol\\%s\\maxclients\\%u\\clients\\%u\\bots\\%u\\hostname\\%s\\modname\\%s\\mapname\\%s\\needpass\\%i\\*fp\\%s\n", masteraddr, NET_AdrToString(tmpbuf, sizeof(tmpbuf), &server->adr), prot, server->maxclients, server->clients, server->bots, *server->hostname?server->hostname:"unnamed", *server->gamedir?server->gamedir:"-", *server->mapname?server->mapname:"-", server->needpass?1:0, fp);
+		else if (*(fp = Info_ValueForKey(server->rules, "*fp")))
+			VFS_PRINTF(f, "%s \\protocol\\%s\\maxclients\\%u\\clients\\%u\\bots\\%u\\hostname\\%s\\modname\\%s\\mapname\\%s\\needpass\\%i\\*fp\\%s\n", NET_AdrToString(tmpbuf, sizeof(tmpbuf), &server->adr), prot, server->maxclients, server->clients, server->bots, *server->hostname?server->hostname:"unnamed", *server->gamedir?server->gamedir:"-", *server->mapname?server->mapname:"-", server->needpass?1:0, fp);
 		else
 			VFS_PRINTF(f, "%s\n", NET_AdrToString(tmpbuf, sizeof(tmpbuf), &server->adr));
 	}
@@ -1728,7 +1730,7 @@ static qboolean SVM_FoundManifest(void *usr, ftemanifest_t *man, enum modsourcet
 static void SVM_Begin(void)
 {	//called once filesystem etc stuff is started.
 	SVM_FoundManifest(NULL, fs_manifest, MST_UNKNOWN);
-	FS_EnumerateKnownGames(SVM_FoundManifest, NULL);
+	FS_EnumerateKnownGames(SVM_FoundManifest, NULL, false);
 
 	Cvar_ForceCallback(&sv_masterport);
 	Cvar_ForceCallback(&sv_masterport_tcp);
@@ -1818,10 +1820,6 @@ void SV_Init (struct quakeparms_s *parms)
 	NET_Init ();
 	COM_Init ();
 
-#ifdef WEBSERVER
-	IWebInit();
-#endif
-
 	Cmd_AddCommand ("quit", SV_Quit_f);
 	Cmd_AddCommand ("status", SVM_Status_f);
 
@@ -1837,7 +1835,6 @@ void SV_Init (struct quakeparms_s *parms)
 		FS_ChangeGame(NULL, true, true);
 
 	Cmd_StuffCmds();
-	Cbuf_Execute ();
 
 	SVM_Begin();
 
diff --git a/engine/server/sv_mvd.c b/engine/server/sv_mvd.c
index 76f02355f..0f4402e98 100644
--- a/engine/server/sv_mvd.c
+++ b/engine/server/sv_mvd.c
@@ -1625,8 +1625,8 @@ qboolean SV_MVD_Record (mvddest_t *dest)
 		{	/*more limited subset supported by ezquake, but not fuhquake/fodquake. sorry.*/
 			demo.recorder.fteprotocolextensions = /*PEXT_CHUNKEDDOWNLOADS|*/PEXT_256PACKETENTITIES|/*PEXT_FLOATCOORDS|*/PEXT_MODELDBL|PEXT_ENTITYDBL|PEXT_ENTITYDBL2|PEXT_SPAWNSTATIC2;
 //			demo.recorder.fteprotocolextensions |= PEXT_HLBSP;	/*ezquake DOES have this, but it is pointless and should have been in some feature mask rather than protocol extensions*/
-//			demo.recorder.fteprotocolextensions |= PEXT_ACCURATETIMINGS;	/*ezquake does not support this any more*/
-//			demo.recorder.fteprotocolextensions |= PEXT_TRANS;	/*ezquake has no support for .alpha*/
+//			demo.recorder.fteprotocolextensions |= PEXT_ACCURATETIMINGS;	/*ezquake does not support this any more. pointless in an mvd anyway*/
+			demo.recorder.fteprotocolextensions |= PEXT_TRANS;	/*ezquake has no support for .alpha*/
 			demo.recorder.fteprotocolextensions2 = PEXT2_VOICECHAT;
 			demo.recorder.zquake_extensions = Z_EXT_PM_TYPE | Z_EXT_PM_TYPE_NEW | Z_EXT_VIEWHEIGHT | Z_EXT_SERVERTIME | Z_EXT_PITCHLIMITS | Z_EXT_JOIN_OBSERVE | Z_EXT_VWEP;
 		}
@@ -1637,7 +1637,7 @@ qboolean SV_MVD_Record (mvddest_t *dest)
 #ifdef PEXT_VIEW2
 			demo.recorder.fteprotocolextensions |= PEXT_VIEW2;
 #endif
-			demo.recorder.fteprotocolextensions2 = PEXT2_VOICECHAT | PEXT2_SETANGLEDELTA | /*PEXT2_PRYDONCURSOR |*/ (pext_replacementdeltas.ival?PEXT2_REPLACEMENTDELTAS:0);
+			demo.recorder.fteprotocolextensions2 = PEXT2_VOICECHAT | PEXT2_SETANGLEDELTA | /*PEXT2_PRYDONCURSOR |*/ (pext_replacementdeltas.ival?PEXT2_REPLACEMENTDELTAS:0) | PEXT2_PREDINFO | PEXT2_NEWSIZEENCODING;
 			/*enable these, because we might as well (stat ones are always useful)*/
 			demo.recorder.zquake_extensions = Z_EXT_PM_TYPE | Z_EXT_PM_TYPE_NEW | Z_EXT_VIEWHEIGHT | Z_EXT_SERVERTIME | Z_EXT_PITCHLIMITS | Z_EXT_JOIN_OBSERVE | Z_EXT_VWEP;
 
@@ -2522,10 +2522,10 @@ void SV_MVDEasyRecord_f (void)
 //console command for servers/admins
 void SV_MVDList_f (void)
 {
+	char buf[32];
 	mvddest_t *d;
 	dir_t	*dir;
 	file_t	*list;
-	float	f;
 	int		i,j,show;
 	qofs_t maxdirsize = MVD_DemoMaxDirSize();
 
@@ -2559,13 +2559,13 @@ void SV_MVDList_f (void)
 	for (d = demo.dest; d; d = d->nextdest)
 		dir->size += d->totalsize;
 
-	Con_Printf("\ndirectory size: %.1fMB\n",(float)dir->size/(1024*1024));
+	Con_Printf("\ndirectory size: %s\n",FS_AbbreviateSize(buf,sizeof(buf), dir->size));
 	if (maxdirsize)
 	{
-		f = (maxdirsize - dir->size)/(1024*1024);
-		if ( f < 0)
-			f = 0;
-		Con_Printf("space available: %.1fMB\n", f);
+		if (maxdirsize >= dir->size)
+			Con_Printf("space available: %s\n", FS_AbbreviateSize(buf,sizeof(buf), maxdirsize - dir->size));
+		else
+			Con_Printf("limit exceeded by %s\n", FS_AbbreviateSize(buf,sizeof(buf), dir->size - maxdirsize));
 	}
 
 	Sys_freedir(dir);
@@ -2574,10 +2574,10 @@ void SV_MVDList_f (void)
 //console command used to print to connected clients (we're acting as a dedicated server)
 void SV_UserCmdMVDList_f (void)
 {
+	char buf[32];
 	mvddest_t *d;
 	dir_t	*dir;
 	file_t	*list;
-	float	f;
 	int		i,j,show;
 	qofs_t maxdirsize = MVD_DemoMaxDirSize();
 
@@ -2622,13 +2622,13 @@ void SV_UserCmdMVDList_f (void)
 	for (d = demo.dest; d; d = d->nextdest)
 		dir->size += d->totalsize;
 
-	SV_ClientPrintf(host_client, PRINT_HIGH, "\ndirectory size: %.1fMB\n",(float)dir->size/(1024*1024));
+	SV_ClientPrintf(host_client, PRINT_HIGH, "\ndirectory size: %s\n",FS_AbbreviateSize(buf,sizeof(buf), dir->size));
 	if (maxdirsize)
 	{
-		f = (maxdirsize - dir->size)/(1024*1024);
-		if ( f < 0)
-			f = 0;
-		SV_ClientPrintf(host_client, PRINT_HIGH, "space available: %.1fMB\n", f);
+		if (maxdirsize >= dir->size)
+			SV_ClientPrintf(host_client, PRINT_HIGH, "space available: %s\n", FS_AbbreviateSize(buf,sizeof(buf), maxdirsize - dir->size));
+		else
+			SV_ClientPrintf(host_client, PRINT_HIGH, "limit exceeded by %s\n", FS_AbbreviateSize(buf,sizeof(buf), dir->size - maxdirsize));
 	}
 
 	Sys_freedir(dir);
diff --git a/engine/server/sv_phys.c b/engine/server/sv_phys.c
index c9699eee4..5f2041782 100644
--- a/engine/server/sv_phys.c
+++ b/engine/server/sv_phys.c
@@ -79,7 +79,7 @@ cvar_t	pm_bunnyfriction	= CVARFD("pm_bunnyfriction", "", CVAR_SERVERINFO, "Repli
 cvar_t	pm_autobunny		= CVARFD("pm_autobunny", "", CVAR_SERVERINFO, "Players will continue jumping without needing to release the jump button.");
 cvar_t	pm_airstep			 = CVARAFD("pm_airstep", "", /*dp*/"sv_jumpstep", CVAR_SERVERINFO, "Allows players to step up while jumping. This makes stairs more graceful but also increases potential jump heights.");
 cvar_t	pm_pground			 = CVARFD("pm_pground", "", CVAR_SERVERINFO, "Use persisten onground state instead of recalculating every frame."CON_WARNING"Do NOT use with nq mods, as most nq mods will interfere with onground state, resulting in glitches.");
-cvar_t	pm_stepdown			 = CVARFD("pm_stepdown", "", CVAR_SERVERINFO, "Causes physics to stick to the ground, instead of constantly losing traction whiloe going down steps.");
+cvar_t	pm_stepdown			 = CVARFD("pm_stepdown", "", CVAR_SERVERINFO, "Causes physics to stick to the ground, instead of constantly losing traction while going down steps.");
 cvar_t	pm_walljump			 = CVARFD("pm_walljump", "", CVAR_SERVERINFO, "Allows the player to bounce off walls while arborne.");
 cvar_t	pm_edgefriction		 = CVARAFD("pm_edgefriction", "", /*nq*/"edgefriction", CVAR_SERVERINFO, "Increases friction when about to walk over a cliff, so you're less likely to plummet by mistake. When empty defaults to 2, but uses a tracebox instead of a traceline to detect the drop.");
 
@@ -1551,8 +1551,8 @@ static void WPhys_Physics_Step (world_t *w, wedict_t *ent)
 
 		if ( (int)ent->v->flags & FL_ONGROUND )	// just hit ground
 		{
-#ifdef HEXEN2
-			if (progstype == PROG_H2 && ((int)ent->v->flags & FL_MONSTER))
+#if defined(HEXEN2) && defined(HAVE_SERVER)
+			if (w==&sv.world && progstype == PROG_H2 && ((int)ent->v->flags & FL_MONSTER))
 				;	//hexen2 monsters do not make landing sounds.
 			else
 #endif
diff --git a/engine/server/sv_rankin.c b/engine/server/sv_rankin.c
index 4f5db06ff..fa0c51d94 100644
--- a/engine/server/sv_rankin.c
+++ b/engine/server/sv_rankin.c
@@ -151,7 +151,6 @@ static void WRITEHEADER(void)
 
 qboolean Rank_OpenRankings(void)
 {
-	char syspath[MAX_OSPATH];
 	size_t result;
 	qboolean created;
 	if (!rankfile)
@@ -161,9 +160,6 @@ qboolean Rank_OpenRankings(void)
 			return false;
 		}
 
-		if (!FS_NativePath(rank_filename.string, FS_GAMEONLY, syspath, sizeof(syspath)))
-			return false;
-
 		rankfile = FS_OpenVFS(rank_filename.string, "r+b", FS_GAMEONLY);
 		if (!rankfile)	//hmm... try creating
 		{
diff --git a/engine/server/sv_send.c b/engine/server/sv_send.c
index f620c6cf6..86c29765f 100644
--- a/engine/server/sv_send.c
+++ b/engine/server/sv_send.c
@@ -794,12 +794,12 @@ void SV_MulticastProtExt(vec3_t origin, multicast_t to, int dimension_mask, int
 				Con_Printf("Skipping multicast for q3 client\n");
 				break;
 
-#ifdef NQPROT
 			case SCP_NETQUAKE:
 			case SCP_BJP3:
 			case SCP_FITZ666:
 			case SCP_DARKPLACES6:
 			case SCP_DARKPLACES7:	//extra prediction stuff
+#ifdef NQPROT
 				if (reliable)
 				{
 					ClientReliableCheckBlock(client, sv.nqmulticast.cursize);
@@ -807,11 +807,10 @@ void SV_MulticastProtExt(vec3_t origin, multicast_t to, int dimension_mask, int
 				}
 				else
 					SZ_Write (&client->datagram, sv.nqmulticast.data, sv.nqmulticast.cursize);
-
-				break;
 #endif
-#ifdef Q2SERVER
+				break;
 			case SCP_QUAKE2:
+#ifdef Q2SERVER
 				if (reliable)
 				{
 					ClientReliableCheckBlock(client, sv.q2multicast[0].cursize);
@@ -819,8 +818,10 @@ void SV_MulticastProtExt(vec3_t origin, multicast_t to, int dimension_mask, int
 				}
 				else
 					SZ_Write (&client->datagram, sv.q2multicast[0].data, sv.q2multicast[0].cursize);
+#endif
 				break;
 			case SCP_QUAKE2EX:
+#ifdef Q2SERVER
 				if (reliable)
 				{
 					ClientReliableCheckBlock(client, sv.q2multicast[1].cursize);
@@ -828,8 +829,8 @@ void SV_MulticastProtExt(vec3_t origin, multicast_t to, int dimension_mask, int
 				}
 				else
 					SZ_Write (&client->datagram, sv.q2multicast[1].data, sv.q2multicast[1].cursize);
-				break;
 #endif
+				break;
 			case SCP_QUAKEWORLD:
 				if (reliable)
 				{
@@ -2644,21 +2645,13 @@ qboolean SV_SendClientDatagram (client_t *client)
 		client->edict->v->goalentity = 0;
 	}
 
-	if (client->netchan.pext_fragmentation)
-	{
-		if (client->netchan.remote_address.type == NA_LOOPBACK)
-			clientlimit = countof(buf);	//biiiig...
-		else
-			clientlimit = client->netchan.mtu;	//try not to overflow
-	}
-	else if (client->netchan.remote_address.type == NA_LOOPBACK && ISNQCLIENT(client))
-		clientlimit = countof(buf);			//go wild. demos don't care about reliable/unreliable.
-	else if (client->netchan.mtu)
-		clientlimit = client->netchan.mtu;
-	else if (client->protocol == SCP_NETQUAKE)
-		clientlimit = MAX_NQDATAGRAM;				//vanilla client is limited.
-	else
-		clientlimit = MAX_DATAGRAM;			//udp limit, ish.
+	clientlimit = Netchan_GetMaxUnreliable(&client->netchan);
+	if (clientlimit < 1024)
+		clientlimit = 1024;	//ignore what the netchan wants. it'll have to fragment it.
+
+	if (client->protocol == SCP_NETQUAKE && clientlimit > MAX_NQDATAGRAM && client->netchan.remote_address.type != NA_LOOPBACK && !client->pextknown)
+		clientlimit = MAX_NQDATAGRAM;	//vanilla clients are limited. don't crash them.
+
 	if (clientlimit > countof(buf))
 		clientlimit = countof(buf);
 	msg.maxsize = clientlimit - client->datagram.cursize;
@@ -2808,7 +2801,7 @@ void SV_FlushBroadcasts (void)
 #ifdef NQPROT
 		if (ISNQCLIENT(client))
 		{
-			if (client->pextknown)
+			if (client->pextknown)	//hacky check - means 'has sent an svc_serverdata'
 			{
 				ClientReliableCheckBlock(client, sv.nqreliable_datagram.cursize);
 				ClientReliableWrite_SZ(client, sv.nqreliable_datagram.data, sv.nqreliable_datagram.cursize);
@@ -3490,13 +3483,12 @@ void SV_SendClientMessages (void)
 				SV_PreRunCmd();
 				stepmsec = 13;
 				cmd.msec = stepmsec;
-
-				c->hoverms += cmd.msec;
+				c->hoverms += cmd.msec;	//sv_showpredloss shows this later when we do get the next packet, instead of potentially spamming every frame while they lag.
 				VectorCopy(c->lastcmd.angles, cmd.angles);
 				cmd.buttons = c->lastcmd.buttons;
 				SV_RunCmd (&cmd, true);
 				SV_PostRunCmd();
-				c->lastruncmd = sv.time*1000-c->msecs;
+				c->lastruncmd = (unsigned int)(sv.time*1000)-c->msecs;
 				if (stepmsec > c->msecs)
 					c->msecs = 0;
 				else
diff --git a/engine/server/sv_sql.c b/engine/server/sv_sql.c
index 47204ae63..eb0062fc5 100644
--- a/engine/server/sv_sql.c
+++ b/engine/server/sv_sql.c
@@ -842,7 +842,7 @@ int SQL_NewServer(void *owner, const char *driver, const char **paramstr)
 		{
 			//anything else is sandboxed into a subdir/database.
 			char *qname = va("sqlite/%s.db", paramstr[3]);
-			if (!FS_NativePath(qname, FS_GAMEONLY, nativepath, sizeof(nativepath)))
+			if (!FS_SystemPath(qname, FS_GAMEONLY, nativepath, sizeof(nativepath)))
 				return -1;
 			paramstr[3] = nativepath;
 			FS_CreatePath(qname, FS_GAMEONLY);
diff --git a/engine/server/sv_sys_unix.c b/engine/server/sv_sys_unix.c
index 66b6e7196..64c487d7f 100644
--- a/engine/server/sv_sys_unix.c
+++ b/engine/server/sv_sys_unix.c
@@ -1339,7 +1339,7 @@ static qboolean Sys_DoInstall(void)
 	FS_CreateBasedir(NULL);
 #else
 	char basedir[MAX_OSPATH];
-	if (!FS_NativePath("", FS_ROOT, basedir, sizeof(basedir)))
+	if (!FS_SystemPath("", FS_ROOT, basedir, sizeof(basedir)))
 		return true;
 	FS_CreateBasedir(basedir);
 #endif
diff --git a/engine/server/sv_user.c b/engine/server/sv_user.c
index f3737a45c..bc1d1b324 100644
--- a/engine/server/sv_user.c
+++ b/engine/server/sv_user.c
@@ -36,17 +36,22 @@ static usercmd_t	cmd;
 
 void QDECL SV_NQPhysicsUpdate(cvar_t *var, char *oldvalue)
 {
-	if (!strcmp(var->string, "auto") || !strcmp(var->string, ""))
-	{	//prediction requires nq physics, so use it by default in multiplayer.
-		if ((svprogfuncs&&PR_FindFunction(svprogfuncs, "SV_RunClientCommand", PR_ANY)))
-			var->ival = 0;	//mods that use explicit custom player physics/pred ALWAYS want qw-like physics (just hope noone forces it off)
-		else if ((svprogfuncs&&PR_FindFunction(svprogfuncs, "SV_PlayerPhysics", PR_ANY)))
-			var->ival = 1;	//DP mods wanting DP's weird physics also suffer NQ behaviours
-		else if (	progstype <= PROG_QW ||	//none or qw use qw physics by default
-				(!isDedicated &&  sv.allocated_client_slots > 1))	//multiplayer dedicated servers use qw physics for nq mods too. server admins are expected to be able to spend a little more time to configure things properly.
-			var->ival = 0;
-		else
-			var->ival = 1;
+	if (svs.gametype != GT_PROGS)
+		var->ival = 0;	//nope, not a thing.
+	else
+	{
+		if (!strcmp(var->string, "auto") || !strcmp(var->string, ""))
+		{	//prediction requires nq physics, so use it by default in multiplayer.
+			if ((svprogfuncs&&PR_FindFunction(svprogfuncs, "SV_RunClientCommand", PR_ANY)))
+				var->ival = 0;	//mods that use explicit custom player physics/pred ALWAYS want qw-like physics (just hope noone forces it off)
+			else if ((svprogfuncs&&PR_FindFunction(svprogfuncs, "SV_PlayerPhysics", PR_ANY)))
+				var->ival = 1;	//DP mods wanting DP's weird physics also suffer NQ behaviours
+			else if (	progstype <= PROG_QW ||	//none or qw use qw physics by default
+					(!isDedicated &&  sv.allocated_client_slots > 1))	//multiplayer dedicated servers use qw physics for nq mods too. server admins are expected to be able to spend a little more time to configure things properly.
+				var->ival = 0;
+			else
+				var->ival = 1;
+		}
 	}
 }
 
@@ -1177,9 +1182,9 @@ void SV_SendClientPrespawnInfo(client_t *client)
 	//just because we CAN generate huge messages doesn't mean that we should.
 	//try to keep packets within reasonable sizes so that we don't trigger insane burst+packetloss on map changes.
 	maxsize = client->netchan.message.maxsize/2;
-	if (client->netchan.mtu && maxsize > client->netchan.mtu-200)
+	if (client->netchan.mtu_cur && maxsize > client->netchan.mtu_cur-200)
 	{
-		maxsize = client->netchan.mtu-200;
+		maxsize = client->netchan.mtu_cur-200;
 		if (maxsize < 500)
 			maxsize = 500;
 	}
@@ -2165,7 +2170,7 @@ void SVQW_Spawn_f (void)
 	ClientReliableWrite_Begin (host_client, svc_stufftext, 8);
 	ClientReliableWrite_String (host_client, "skins\n" );
 
-	if (sv.allocated_client_slots > 1)
+	if (sv.allocated_client_slots > 1 && svs.gametype == GT_PROGS)
 	{	//okay, so nq player physics don't suppot prediction.
 		//if we use qw physics in nq mods then we risk breaking things.
 		//the only progs many players will have is the vanilla nq one.
@@ -2533,7 +2538,6 @@ void SV_Begin_f (void)
 	host_client->netchan.frame_latency = 0;
 	host_client->netchan.frame_rate = 0;
 	host_client->netchan.drop_count = 0;
-	host_client->netchan.good_count = 0;
 
 	//check he's not cheating
 	if (progstype == PROG_QW)
@@ -2737,7 +2741,7 @@ static void SV_NextChunkedDownload(unsigned int chunknum, int ezpercent, int ezf
 
 			if (msg == &msg_oob)
 			{
-				Netchan_OutOfBand(NS_SERVER, &host_client->netchan.remote_address, msg_oob.cursize, msg_oob.data);
+				Netchan_OutOfBand(NCF_SERVER, &host_client->netchan.remote_address, msg_oob.cursize, msg_oob.data);
 				Netchan_Block(&host_client->netchan, msg_oob.cursize, SV_RateForClient(host_client));
 				host_client->netchan.bytesout += msg_oob.cursize;
 			}
@@ -3067,6 +3071,7 @@ void SV_VoiceReadPacket(void)
 				(ring->receiver[1]<<8) |
 				(ring->receiver[2]<<16) |
 				(ring->receiver[3]<<24);
+			//FIXME: 32 maxplayers limit.
 			msg = MVDWrite_Begin (dem_multiple, cls, ring->datalen+6);
 		}
 
@@ -3257,10 +3262,8 @@ void SV_Voice_UnmuteAll_f(void)
 }
 #endif
 
-qboolean SV_FindRemotePackage(const char *package, char *url, size_t urlsize)
+int SV_FindRemotePackage(const char *package, char *url, size_t urlsize)
 {
-	//FIXME: interrogate the package manager first? it probably doesn't have source urls though. I guess that should be done clientside.
-
 	//basedir/gamedir/curl_urls.txt contains something like:
 	//maps_*.pk3 https://host/maps/
 	//* https://host/gamedir/
@@ -3273,40 +3276,47 @@ qboolean SV_FindRemotePackage(const char *package, char *url, size_t urlsize)
 	//filter out the gamedir, so different gamedirs can have different sets of urls.
 	//(useful for eg pakN.pak, if it were not blocked elsewhere)
 	char *sep = strchr(package, '/');
-	if (!sep || sep-package>=sizeof(line))
-		return false;
-	memcpy(line, package, sep-package+1);
-	line[sep-package+1] = 0;
-	package = sep+1;
-
-	/*compat with xonotic*/
-	Q_strncatz(line, "curl_urls.txt", sizeof(line));
-	f = FS_OpenVFS(line, "rb", FS_ROOT);	//this is for server admins to deal with. urls are too unreliable for paks.
-	if (f)
+	if (sep && sep-package<sizeof(line))
 	{
-		char pattern[256];
-		char *e;
-		while (VFS_GETS(f, line, sizeof(line)))
+		sep++;
+		memcpy(line, package, sep-package);
+		line[sep-package] = 0;
+		//line is now 'gamedir/', sep is the gamedirless package
+
+		/*compat with xonotic*/
+		Q_strncatz(line, "curl_urls.txt", sizeof(line));
+		f = FS_OpenVFS(line, "rb", FS_ROOT);	//this is for server admins to deal with. urls are too unreliable for paks.
+		if (f)
 		{
-			e = COM_ParseOut(line, pattern, sizeof(pattern));
-			if (*pattern && wildcmp(pattern, package))
+			char pattern[256];
+			char *e;
+			while (VFS_GETS(f, line, sizeof(line)))
 			{
-				COM_ParseOut(e, url, urlsize);
-				Q_strncatz(url, package, urlsize);
-				VFS_CLOSE(f);
-				return true;
+				e = COM_ParseOut(line, pattern, sizeof(pattern));
+				if (*pattern && wildcmp(pattern, sep))
+				{
+					COM_ParseOut(e, url, urlsize);
+					Q_strncatz(url, sep, urlsize);
+					VFS_CLOSE(f);
+					return DLERR_SV_REDIRECTPACK;
+				}
 			}
+			VFS_CLOSE(f);
 		}
-		VFS_CLOSE(f);
 	}
 
+	//curl stuff is explicit so goes first.
+	//NOW try the package manager. probably it'll just redirect to the dlcache dir.
+//	if (PM_HandleRedirect(package, url, urlsize))
+//		return DLERR_SV_PACKAGE;
+
 	if (*fs_dlURL.string)
 	{	//a fallback, though the above mechanism allows for a wildcard for all.
 		Q_strncatz(fs_dlURL.string, package, urlsize);
 		Q_strncatz(url, package, urlsize);
-		return true;
+		return DLERR_SV_REDIRECTPACK;
 	}
-	return false;
+	return DLERR_FILENOTFOUND;
 }
 
 //Use of this function is on name only.
@@ -3451,6 +3461,8 @@ static int SV_LocateDownload(const char *name, flocation_t *loc, char **replacem
 	qboolean found;
 	static char tmpname[MAX_QPATH];
 
+//Con_Printf("%s request for %s\n", redirectpaks?"dlsize":"download", name);
+
 	if (replacementname)
 		*replacementname = NULL;
 
@@ -3500,19 +3512,47 @@ static int SV_LocateDownload(const char *name, flocation_t *loc, char **replacem
 
 	if (!Q_strncasecmp(name, "package/", 8))
 	{
-		vfsfile_t *f;
-		if (redirectpaks && SV_FindRemotePackage(name+8, tmpname, sizeof(tmpname)))
+		vfsfile_t *f = NULL;
+		searchpath_t *p;
+		if (redirectpaks)
 		{
-			*replacementname = tmpname;
-			return DLERR_REDIRECTFILE;
+			int redir = SV_FindRemotePackage(name+8, tmpname, sizeof(tmpname));
+//			can't handle http here. caller won't know what we mean
+			if (redir == DLERR_SV_PACKAGE)
+			{
+Con_Printf("Complex Redirecting %s to %s\n", name, tmpname);
+				Q_strncpyz(loc->rawname, tmpname, sizeof(loc->rawname));
+				return DLERR_SV_PACKAGE;
+			}
+			else if (redir == DLERR_SV_REDIRECTPACK)
+			{	//probably an http(s) path
+Con_Printf("Simple Redirecting %s to %s\n", name, tmpname);
+				*replacementname = tmpname;
+				return DLERR_SV_REDIRECTPACK;
+			}
 		}
 
-		f = FS_OpenVFS(name+8, "rb", FS_ROOT);
+		p = FS_GetPackage(name+8);
+		if (p && !*p->prefix)
+		{
+			if (FS_GenCachedPakName(name+8, va("%i", p->crc_check), loc->rawname, sizeof(loc->rawname)))
+			{
+				f = FS_OpenVFS(loc->rawname, "rb", FS_ROOT);	//it was cached
+				if (!f)
+				{
+					Q_strncpyz(loc->rawname, name+8, sizeof(loc->rawname));
+					f = FS_OpenVFS(loc->rawname, "rb", FS_ROOT);	//not cached go direct.
+				}
+			}
+			//else some evil path we're best off avoiding
+		}
+		else
+			f = NULL;	//don't let em grab paks we're not using ourselves.
 		if (f)
 		{
 			loc->len = VFS_GETLEN(f);
 			VFS_CLOSE(f);
-			return DLERR_PACKAGE;	//found package
+			return DLERR_SV_PACKAGE;	//found package
 		}
 		else
 			return DLERR_FILENOTFOUND;	//not found/unable to open
@@ -3586,7 +3626,7 @@ static int SV_LocateDownload(const char *name, flocation_t *loc, char **replacem
 					{	//this path is non authoritive, but we shouldn't be pushing people to download files they're not going to be allowed to download.
 						Q_snprintfz(tmpname, sizeof(tmpname), "package/%s", pakname);
 						*replacementname = tmpname;
-						return DLERR_REDIRECTPACK;	//redirect
+						return DLERR_SV_REDIRECTPACK;	//redirect
 					}
 				}
 			}
@@ -3616,7 +3656,7 @@ static int SV_LocateDownload(const char *name, flocation_t *loc, char **replacem
 		}
 
 		if (replacementname && *replacementname)
-			return DLERR_REDIRECTPACK;
+			return DLERR_SV_REDIRECTPACK;
 		return 0;
 	}
 	return -1;	//not found
@@ -3631,8 +3671,9 @@ void SV_DownloadSize_f(void)
 
 	switch(SV_LocateDownload(name, &loc, &redirected, true))
 	{
+	case DLERR_SV_REDIRECTPACK: /*redirect (the containing package)*/
+
 	case DLERR_REDIRECTFILE: /*redirect (extension difference or so)*/
-	case DLERR_REDIRECTPACK: /*redirect (the containing package)*/
 		name = va("dlsize \"%s\" r \"%s\"\n", name, redirected);
 		ClientReliableWrite_Begin (host_client, svc_stufftext, 2+strlen(name));
 		ClientReliableWrite_String (host_client, name);
@@ -3648,7 +3689,7 @@ void SV_DownloadSize_f(void)
 		ClientReliableWrite_Begin (host_client, svc_stufftext, 2+strlen(name));
 		ClientReliableWrite_String (host_client, name);
 		break;
-	case DLERR_PACKAGE: /*requested file is a package*/
+	case DLERR_SV_PACKAGE: /*requested file is a package*/
 	case 0: /*file exists*/
 		name = va("dlsize \"%s\" %u\n", name, (unsigned int)loc.len);
 		ClientReliableWrite_Begin (host_client, svc_stufftext, 2+strlen(name));
@@ -3845,16 +3886,16 @@ void SV_BeginDownload_f(void)
 
 	result = SV_LocateDownload(name, &loc, &redirection, false);
 
-	if (result == DLERR_PACKAGE)
+	if (result == DLERR_SV_PACKAGE)
 	{
 		//package download
 		result = 0;
-		host_client->download = FS_OpenVFS(name+8, "rb", FS_ROOT);
+		host_client->download = FS_OpenVFS(loc.rawname, "rb", FS_ROOT);
 	}
 	else
 	{
 		//redirection protocol-specific code goes here.
-		if (result == DLERR_REDIRECTPACK || result == DLERR_REDIRECTFILE)
+		if (result == DLERR_SV_REDIRECTPACK || result == DLERR_REDIRECTFILE)
 		{
 #ifdef PEXT_CHUNKEDDOWNLOADS
 			//ezquake etc cannot cope with proper redirects
@@ -3917,7 +3958,8 @@ void SV_BeginDownload_f(void)
 			result = DLERR_PERMISSIONS;
 			error = "Client doesn't support file redirection for %s\n";
 			break;
-		case DLERR_REDIRECTPACK:
+		case DLERR_SV_REDIRECTPACK:
+		case DLERR_SV_PACKAGE:
 			result = DLERR_PERMISSIONS;
 			error = "Package contents not available individually\n";
 			break;
@@ -5976,6 +6018,8 @@ static void Cmd_FPSList_f(void)
 			SV_ClientPrintf(host_client, PRINT_HIGH, "%s: %gfps (%g - %g), c2s: %ibps, s2c: %ibps, ping %ims(-%i), pl %i%% %s\n", cl->name, ftime/frames, minf, maxf, (int)cl->inrate, (int)cl->outrate, SV_CalcPing(cl, false), (int)(1000*cl->delay), cl->lossage, protoname);
 		else
 			SV_ClientPrintf(host_client, PRINT_HIGH, "%s: unknown framerate, c2s: %ibps, s2c: %ibps, ping %ims(-%i), pl %i%% %s\n", cl->name, (int)cl->inrate, (int)cl->outrate, SV_CalcPing(cl, false), (int)(1000*cl->delay), cl->lossage, protoname);
+
+//		SV_ClientPrintf(host_client, PRINT_HIGH, CON_DEBUG"%s: %i\n", cl->name, cl->netchan.mtu_cur);
 	}
 }
 
@@ -6106,7 +6150,6 @@ static void SVNQ_Begin_f (void)
 	host_client->netchan.frame_latency = 0;
 	host_client->netchan.frame_rate = 0;
 	host_client->netchan.drop_count = 0;
-	host_client->netchan.good_count = 0;
 
 	//check he's not cheating
 
@@ -6633,6 +6676,7 @@ ucmd_t nqucmds[] =
 	{"dlsize",		SV_DownloadSize_f},
 	{"download",	SV_BeginDownload_f},
 	{"sv_startdownload",	SVDP_StartDownload_f},
+	{"stopdownload",	SV_StopDownload_f},
 
 	{"serverinfo", SV_ShowServerinfo_f},
 	/*userinfo stuff*/
@@ -6918,19 +6962,19 @@ static qboolean AddEntityToPmove(world_t *w, wedict_t *player, wedict_t *check)
 	safeswitch(q1contents)
 	{
 	case Q1CONTENTS_EMPTY:			pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_EMPTY;	break;
-	case Q1CONTENTS_TRANS:
 	case Q1CONTENTS_SOLID:			pe->nonsolid = false;	pe->forcecontentsmask = FTECONTENTS_SOLID;	break;
 	case Q1CONTENTS_WATER:			pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_WATER;	break;
 	case Q1CONTENTS_LAVA:			pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_LAVA;	break;
 	case Q1CONTENTS_SLIME:			pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_SLIME;	break;
 	case Q1CONTENTS_SKY:			pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_SKY;	break;
-	case Q1CONTENTS_CLIP:			pe->nonsolid = false;	pe->forcecontentsmask = FTECONTENTS_PLAYERCLIP|FTECONTENTS_MONSTERCLIP;	break;
-	case Q1CONTENTS_CURRENT_0:		pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_0;			break;
-	case Q1CONTENTS_CURRENT_90:		pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_90;		break;
-	case Q1CONTENTS_CURRENT_180:	pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_180;		break;
-	case Q1CONTENTS_CURRENT_270:	pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_270;		break;
-	case Q1CONTENTS_CURRENT_UP:		pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_UP;		break;
-	case Q1CONTENTS_CURRENT_DOWN:	pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_DOWN;		break;
+	case HLCONTENTS_CLIP:			pe->nonsolid = false;	pe->forcecontentsmask = FTECONTENTS_PLAYERCLIP|FTECONTENTS_MONSTERCLIP;	break;
+	case HLCONTENTS_CURRENT_0:		pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_0;			break;
+	case HLCONTENTS_CURRENT_90:		pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_90;		break;
+	case HLCONTENTS_CURRENT_180:	pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_180;		break;
+	case HLCONTENTS_CURRENT_270:	pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_270;		break;
+	case HLCONTENTS_CURRENT_UP:		pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_UP;		break;
+	case HLCONTENTS_CURRENT_DOWN:	pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_DOWN;		break;
+	case HLCONTENTS_TRANS:			pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_EMPTY;	break;
 	case Q1CONTENTS_LADDER:			pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_LADDER;			break;
 	case Q1CONTENTS_MONSTERCLIP:	pe->nonsolid = true;	pe->forcecontentsmask = FTECONTENTS_MONSTERCLIP;	break;
 	case Q1CONTENTS_PLAYERCLIP:		pe->nonsolid = false;	pe->forcecontentsmask = FTECONTENTS_PLAYERCLIP;		break;
@@ -8248,7 +8292,7 @@ static double SVFTE_ExecuteClientMove(client_t *controller)
 					if (split->lastcmd.servertime < split->lastruncmd)
 					{
 						if (sv_showpredloss.ival)
-							Con_Printf("%s: client jumped %u msecs backwards (anti speed cheat)\n", split->name, split->lastruncmd - split->lastcmd.servertime);
+							Con_Printf("%s: client jumped %u msecs backwards (anti speed cheat buffering)\n", split->name, split->lastruncmd - split->lastcmd.servertime);
 					}
 					else if (split->lastruncmd < split->lastcmd.servertime)
 					{
@@ -8257,7 +8301,7 @@ static double SVFTE_ExecuteClientMove(client_t *controller)
 							//from last map?... attempted speedcheat?
 							if (sv_showpredloss.ival)
 								Con_Printf("%s: client is %u msecs in the future (anti speed cheat)\n", split->name, split->lastcmd.servertime - curtime);
-							split->lastcmd.servertime = curtime;
+							split->lastcmd.servertime = curtime;	//push it back to what we thought it would be...
 						}
 
 						if (!ran)
@@ -8266,6 +8310,8 @@ static double SVFTE_ExecuteClientMove(client_t *controller)
 							ran=true;
 						}
 
+						split->lastcmd.msec = split->lastcmd.servertime - split->lastruncmd;
+
 						SV_Prompt_Input(split, &split->lastcmd);
 						SV_RunCmd (&split->lastcmd, false);
 						split->lastruncmd = split->lastcmd.servertime;
diff --git a/engine/server/world.c b/engine/server/world.c
index 5b4e616b6..662e9a11a 100644
--- a/engine/server/world.c
+++ b/engine/server/world.c
@@ -1021,14 +1021,14 @@ static trace_t World_ClipMoveToEntity (world_t *w, wedict_t *ent, vec3_t eorg, v
 		case Q1CONTENTS_LAVA:			forcedcontents = FTECONTENTS_LAVA;			break;
 		case Q1CONTENTS_SKY:			forcedcontents = FTECONTENTS_SKY;			break;
 		case Q1CONTENTS_LADDER:			forcedcontents = FTECONTENTS_LADDER;		break;
-		case Q1CONTENTS_CLIP:			forcedcontents = FTECONTENTS_PLAYERCLIP|FTECONTENTS_MONSTERCLIP;break;
-		case Q1CONTENTS_CURRENT_0:		forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_0;		break;
-		case Q1CONTENTS_CURRENT_90:		forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_90;		break;
-		case Q1CONTENTS_CURRENT_180:	forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_180;		break;
-		case Q1CONTENTS_CURRENT_270:	forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_270;		break;
-		case Q1CONTENTS_CURRENT_UP:		forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_UP;		break;
-		case Q1CONTENTS_CURRENT_DOWN:	forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_DOWN;		break;
-		case Q1CONTENTS_TRANS:			forcedcontents = FTECONTENTS_SOLID;			break;
+		case HLCONTENTS_CLIP:			forcedcontents = FTECONTENTS_PLAYERCLIP|FTECONTENTS_MONSTERCLIP;break;
+		case HLCONTENTS_CURRENT_0:		forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_0;		break;
+		case HLCONTENTS_CURRENT_90:		forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_90;		break;
+		case HLCONTENTS_CURRENT_180:	forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_180;		break;
+		case HLCONTENTS_CURRENT_270:	forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_270;		break;
+		case HLCONTENTS_CURRENT_UP:		forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_UP;		break;
+		case HLCONTENTS_CURRENT_DOWN:	forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_DOWN;		break;
+		case HLCONTENTS_TRANS:			forcedcontents = FTECONTENTS_EMPTY;			break;
 		case Q1CONTENTS_MONSTERCLIP:	forcedcontents = FTECONTENTS_MONSTERCLIP;	break;
 		case Q1CONTENTS_PLAYERCLIP:		forcedcontents = FTECONTENTS_PLAYERCLIP;	break;
 		case Q1CONTENTS_CORPSE:scorpse: forcedcontents = FTECONTENTS_CORPSE;		break;
@@ -1890,14 +1890,14 @@ static unsigned int World_ContentsOfLinks (world_t *w, areagridlink_t *node, vec
 			case Q1CONTENTS_SLIME:			forcedcontents = FTECONTENTS_SLIME;			break;
 			case Q1CONTENTS_LAVA:			forcedcontents = FTECONTENTS_LAVA;			break;
 			case Q1CONTENTS_SKY:			forcedcontents = FTECONTENTS_SKY;			break;
-			case Q1CONTENTS_CLIP:			forcedcontents = FTECONTENTS_PLAYERCLIP|FTECONTENTS_MONSTERCLIP;	break;
-			case Q1CONTENTS_CURRENT_0:		forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_0;			break;
-			case Q1CONTENTS_CURRENT_90:		forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_90;			break;
-			case Q1CONTENTS_CURRENT_180:	forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_180;			break;
-			case Q1CONTENTS_CURRENT_270:	forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_270;			break;
-			case Q1CONTENTS_CURRENT_UP:		forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_UP;			break;
-			case Q1CONTENTS_CURRENT_DOWN:	forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_DOWN;			break;
-			case Q1CONTENTS_TRANS:			forcedcontents = FTECONTENTS_SOLID;			break;
+			case HLCONTENTS_CLIP:			forcedcontents = FTECONTENTS_PLAYERCLIP|FTECONTENTS_MONSTERCLIP;	break;
+			case HLCONTENTS_CURRENT_0:		forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_0;			break;
+			case HLCONTENTS_CURRENT_90:		forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_90;			break;
+			case HLCONTENTS_CURRENT_180:	forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_180;			break;
+			case HLCONTENTS_CURRENT_270:	forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_270;			break;
+			case HLCONTENTS_CURRENT_UP:		forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_UP;			break;
+			case HLCONTENTS_CURRENT_DOWN:	forcedcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_DOWN;			break;
+			case HLCONTENTS_TRANS:			forcedcontents = FTECONTENTS_EMPTY;			break;
 			case Q1CONTENTS_LADDER:			forcedcontents = FTECONTENTS_LADDER;		break;
 			case Q1CONTENTS_MONSTERCLIP:	forcedcontents = FTECONTENTS_MONSTERCLIP;	break;
 			case Q1CONTENTS_PLAYERCLIP:		forcedcontents = FTECONTENTS_PLAYERCLIP;	break;
@@ -2142,11 +2142,15 @@ static void World_ClipToNetwork (world_t *w, moveclip_t *clip)
 	if ((clip->type & MOVE_ENTCHAIN) || !pe)
 		return;
 
-	skip = ((csqcedict_t*)clip->passedict)->xv->entnum;
-
 	//lets say that ssqc ents are in dimension 0x1, as far as the csqc can see.
-	if (clip->passedict && !((int)clip->passedict->xv->dimension_hit & 1))
-		return;
+	if (clip->passedict)
+	{
+		if (!((int)clip->passedict->xv->dimension_hit & 1))
+			return;
+		skip = ((csqcedict_t*)clip->passedict)->xv->entnum;
+	}
+	else
+		skip = 0;
 
 	for (i = 0; i < pe->num_entities; i++)
 	{
@@ -2187,21 +2191,21 @@ static void World_ClipToNetwork (world_t *w, moveclip_t *clip)
 			{
 			case Q1CONTENTS_EMPTY:			touchcontents = 0;							break;
 			case Q1CONTENTS_SOLID:			touchcontents = FTECONTENTS_SOLID;			break;
-			case Q1CONTENTS_LADDER:			touchcontents = FTECONTENTS_LADDER;			break;
-			case Q1CONTENTS_SKY:			touchcontents = FTECONTENTS_SKY;			break;
-			case Q1CONTENTS_LAVA:			touchcontents = FTECONTENTS_LAVA;			break;
-			case Q1CONTENTS_SLIME:			touchcontents = FTECONTENTS_SLIME;			break;
 			case Q1CONTENTS_WATER:			touchcontents = FTECONTENTS_WATER;			break;
-			case Q1CONTENTS_PLAYERCLIP:		touchcontents = FTECONTENTS_PLAYERCLIP;		break;
+			case Q1CONTENTS_SLIME:			touchcontents = FTECONTENTS_SLIME;			break;
+			case Q1CONTENTS_LAVA:			touchcontents = FTECONTENTS_LAVA;			break;
+			case Q1CONTENTS_SKY:			touchcontents = FTECONTENTS_SKY;			break;
+			case HLCONTENTS_CLIP:			touchcontents = FTECONTENTS_PLAYERCLIP|FTECONTENTS_MONSTERCLIP;	break;
+			case HLCONTENTS_CURRENT_0:		touchcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_0;			break;
+			case HLCONTENTS_CURRENT_90:		touchcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_90;		break;
+			case HLCONTENTS_CURRENT_180:	touchcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_180;		break;
+			case HLCONTENTS_CURRENT_270:	touchcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_270;		break;
+			case HLCONTENTS_CURRENT_UP:		touchcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_UP;		break;
+			case HLCONTENTS_CURRENT_DOWN:	touchcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_DOWN;		break;
+			case HLCONTENTS_TRANS:			touchcontents = FTECONTENTS_EMPTY;								break;
+			case Q1CONTENTS_LADDER:			touchcontents = FTECONTENTS_LADDER;			break;
 			case Q1CONTENTS_MONSTERCLIP:	touchcontents = FTECONTENTS_MONSTERCLIP;	break;
-			case Q1CONTENTS_CLIP:			touchcontents = FTECONTENTS_PLAYERCLIP|FTECONTENTS_MONSTERCLIP;	break;
-			case Q1CONTENTS_TRANS:			touchcontents = FTECONTENTS_WINDOW;								break;
-			case Q1CONTENTS_CURRENT_0:		touchcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_0;			break;
-			case Q1CONTENTS_CURRENT_90:		touchcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_90;		break;
-			case Q1CONTENTS_CURRENT_180:	touchcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_180;		break;
-			case Q1CONTENTS_CURRENT_270:	touchcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_270;		break;
-			case Q1CONTENTS_CURRENT_UP:		touchcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_UP;		break;
-			case Q1CONTENTS_CURRENT_DOWN:	touchcontents = FTECONTENTS_WATER|Q2CONTENTS_CURRENT_DOWN;		break;
+			case Q1CONTENTS_PLAYERCLIP:		touchcontents = FTECONTENTS_PLAYERCLIP;		break;
 			case Q1CONTENTS_CORPSE:			touchcontents = FTECONTENTS_CORPSE;			break;
 			safedefault:					touchcontents = ~0;							break;	//could be anything... :(
 			}
diff --git a/engine/shaders/glsl/altwater.glsl b/engine/shaders/glsl/altwater.glsl
index 1f0731792..d576121f8 100644
--- a/engine/shaders/glsl/altwater.glsl
+++ b/engine/shaders/glsl/altwater.glsl
@@ -107,8 +107,7 @@ void main (void)
 	n = texture2D(s_normalmap, ntc).xyz - 0.5;
 #else
 	//apply q1-style warp, just for kicks
-	ntc.s = tc.s + sin(tc.t+e_time)*0.125;
-	ntc.t = tc.t + sin(tc.s+e_time)*0.125;
+	ntc = tc + sin(tc.ts+e_time)*0.125;
 
 	//generate the two wave patterns from the normalmap
 	n = (texture2D(s_normalmap, vec2(TXSCALE1)*tc + vec2(e_time*0.1, 0.0)).xyz);
diff --git a/engine/shaders/glsl/defaultskin.glsl b/engine/shaders/glsl/defaultskin.glsl
index f2a3e7b31..3b1c1aab0 100644
--- a/engine/shaders/glsl/defaultskin.glsl
+++ b/engine/shaders/glsl/defaultskin.glsl
@@ -83,10 +83,16 @@ void main ()
 	s = normalize(s);
 	t = normalize(t);
 	#ifndef PBR
-		float d = dot(n,e_light_dir);
-		if (d < 0.0)		//vertex shader. this might get ugly, but I don't really want to make it per vertex.
-			d = 0.0;	//this avoids the dark side going below the ambient level.
-		light.rgb += (d*e_light_mul);
+		#ifdef EIGHTBIT
+			//doesn't darken in the shade, only gets brighter in the light (overbrighting)
+			light.rgb += max(0.0,dot(n,e_light_dir)) * e_light_mul;
+		#else
+			//_DOES_ get darker in the shade, despite the light not lighting it at all....
+			float d = dot(n,e_light_dir);
+			if (d < 0)
+				d *= 13.0/44.0;	//a wtfery factor to approximate glquake's anorm_dots.h
+			light.rgb += d * e_light_mul;
+		#endif
 	#else
 		light.rgb = vec3(1.0);
 	#endif
diff --git a/engine/shaders/glsl/defaultwall.glsl b/engine/shaders/glsl/defaultwall.glsl
index 4a50bae3b..5b18bafc6 100644
--- a/engine/shaders/glsl/defaultwall.glsl
+++ b/engine/shaders/glsl/defaultwall.glsl
@@ -402,6 +402,8 @@ void main ()
 
 #ifdef REFLECTCUBEMASK
 	vec3 rtc = reflect(normalize(-eyevector), norm);
+	//todo: parallax correction: https://seblagarde.wordpress.com/2012/09/29/image-based-lighting-approaches-and-parallax-corrected-cubemap/
+	//norm (and also eyevector) are in tangentspace but our cubemap wants worldspace, so convert.
 	rtc = rtc.x*invsurface[0] + rtc.y*invsurface[1] + rtc.z*invsurface[2];
 	rtc = (m_model * vec4(rtc.xyz,0.0)).xyz;
 	col.rgb += texture2D(s_reflectmask, tc).rgb * textureCube(s_reflectcube, rtc).rgb;
diff --git a/engine/shaders/glsl/defaultwarp.glsl b/engine/shaders/glsl/defaultwarp.glsl
index 69eaaad99..a603ac9de 100644
--- a/engine/shaders/glsl/defaultwarp.glsl
+++ b/engine/shaders/glsl/defaultwarp.glsl
@@ -32,9 +32,7 @@ void main ()
 #ifdef FRAGMENT_SHADER
 void main ()
 {
-	vec2 ntc;
-	ntc.s = tc.s + sin(tc.t+e_time)*0.125;
-	ntc.t = tc.t + sin(tc.s+e_time)*0.125;
+	vec2 ntc = tc + sin(tc.ts+e_time)*0.125;
 	vec3 ts = vec3(texture2D(s_diffuse, ntc));
 
 #ifdef LIT
diff --git a/engine/shaders/hlsl11/defaultsprite.hlsl b/engine/shaders/hlsl11/defaultsprite.hlsl
index 3b3ae28fc..c564a07b3 100644
--- a/engine/shaders/hlsl11/defaultsprite.hlsl
+++ b/engine/shaders/hlsl11/defaultsprite.hlsl
@@ -1,4 +1,4 @@
-!!samps diffuse
+!!samps 1
 
 struct a2v
 {
@@ -41,4 +41,4 @@ struct v2f
 		//FIXME: no fog, no colourmod
 		return tex * inp.vcol;
 	}
-#endif
\ No newline at end of file
+#endif
diff --git a/engine/shaders/hlsl11/defaultwarp.hlsl b/engine/shaders/hlsl11/defaultwarp.hlsl
index 642c8e0ab..ffac943c1 100644
--- a/engine/shaders/hlsl11/defaultwarp.hlsl
+++ b/engine/shaders/hlsl11/defaultwarp.hlsl
@@ -33,10 +33,8 @@ struct v2f
 	Texture2D t_diffuse;
 	float4 main (v2f inp) : SV_TARGET
 	{
-		float2 ntc;
+		float2 ntc = inp.tc + sin(inp.tc.yx+e_time)*0.125;
 		float4 r;
-		ntc.x = inp.tc.x + sin(inp.tc.y+e_time)*0.125;
-		ntc.y = inp.tc.y + sin(inp.tc.x+e_time)*0.125;
 		r = t_diffuse.Sample(s_diffuse, ntc);
 #ifdef ALPHA
 		r.a = float(ALPHA);
@@ -45,4 +43,4 @@ struct v2f
 #endif
 		return r;
 	}
-#endif
\ No newline at end of file
+#endif
diff --git a/engine/shaders/hlsl9/defaultwarp.hlsl b/engine/shaders/hlsl9/defaultwarp.hlsl
index aa521bbcc..8f183fdd4 100644
--- a/engine/shaders/hlsl9/defaultwarp.hlsl
+++ b/engine/shaders/hlsl9/defaultwarp.hlsl
@@ -28,9 +28,7 @@ struct v2f {
 	sampler s_diffuse;
 	float4 main (v2f inp) : COLOR0
 	{
-		float2 ntc;
-		ntc.x = inp.tc.x + sin(inp.tc.y+e_time)*0.125;
-		ntc.y = inp.tc.y + sin(inp.tc.x+e_time)*0.125;
+		float2 ntc = inp.tc + sin(inp.tc.yx+e_time)*0.125;
 		float3 ts = tex2D(s_diffuse, ntc).xyz;
 
 #ifdef ALPHA
diff --git a/engine/vk/vk_init.c b/engine/vk/vk_init.c
index 0118ce1ac..3880889eb 100644
--- a/engine/vk/vk_init.c
+++ b/engine/vk/vk_init.c
@@ -2216,22 +2216,20 @@ void	VK_R_DeInit					(void)
 	Image_Shutdown();
 }
 
-void VK_SetupViewPortProjection(qboolean flipy, vec3_t *eyeangorg, float *fovoverrides)
+void VK_SetupViewPortProjection(qboolean flipy, const float eyematrix[12], const float fovoverrides[4], const float projmatrix[16])
 {
 	float fov_x, fov_y;
 	float fovv_x, fovv_y;
 
 	float fov_l, fov_r, fov_d, fov_u;
 
-	if (eyeangorg)
+	if (eyematrix)
 	{
 		extern cvar_t in_vraim;
 		matrix3x4 basematrix;
-		matrix3x4 eyematrix;
 		matrix3x4 viewmatrix;
 		vec3_t newa;
 
-		Matrix3x4_RM_FromAngles(eyeangorg[0], eyeangorg[1], eyematrix[0]);
 		if (r_refdef.base_known)
 		{	//mod is specifying its own base ang+org.
 			Matrix3x4_RM_FromAngles(r_refdef.base_angles, r_refdef.base_origin, basematrix[0]);
@@ -2245,7 +2243,7 @@ void VK_SetupViewPortProjection(qboolean flipy, vec3_t *eyeangorg, float *fovove
 				newa[1] -= SHORT2ANGLE(r_refdef.playerview->vrdev[VRDEV_HEAD].angles[YAW]);
 			Matrix3x4_RM_FromAngles(newa, r_refdef.vieworg, basematrix[0]);
 		}
-		Matrix3x4_Multiply(eyematrix[0], basematrix[0], viewmatrix[0]);
+		Matrix3x4_Multiply(eyematrix, basematrix[0], viewmatrix[0]);
 		Matrix3x4_RM_ToVectors(viewmatrix[0], vpn, vright, vup, r_origin);
 		VectorNegate(vright, vright);
 
@@ -2273,41 +2271,58 @@ void VK_SetupViewPortProjection(qboolean flipy, vec3_t *eyeangorg, float *fovove
 		r_refdef.flipcull = 0;
 	}
 
-	fov_x = r_refdef.fov_x;//+sin(cl.time)*5;
-	fov_y = r_refdef.fov_y;//-sin(cl.time+1)*5;
-	fovv_x = r_refdef.fovv_x;
-	fovv_y = r_refdef.fovv_y;
-	if ((r_refdef.flags & RDF_UNDERWATER) && !(r_refdef.flags & RDF_WATERWARP))
+	if (projmatrix)
 	{
-		fov_x *= 1 + (((sin(cl.time * 4.7) + 1) * 0.015) * r_waterwarp.value);
-		fov_y *= 1 + (((sin(cl.time * 3.0) + 1) * 0.015) * r_waterwarp.value);
-		fovv_x *= 1 + (((sin(cl.time * 4.7) + 1) * 0.015) * r_waterwarp.value);
-		fovv_y *= 1 + (((sin(cl.time * 3.0) + 1) * 0.015) * r_waterwarp.value);
-	}
-	if (fovoverrides)
-	{
-		fov_l = fovoverrides[0];
-		fov_r = fovoverrides[1];
-		fov_d = fovoverrides[2];
-		fov_u = fovoverrides[3];
-
-		fov_x = fov_r-fov_l;
-		fov_y = fov_u-fov_d;
-
-		fovv_x = fov_x;
-		fovv_y = fov_y;
-		r_refdef.flipcull = ((fov_u < fov_d)^(fov_r < fov_l))?SHADER_CULL_FLIP:0;
+		memcpy(r_refdef.m_projection_std, projmatrix, sizeof(r_refdef.m_projection_std));
+		memcpy(r_refdef.m_projection_view, projmatrix, sizeof(r_refdef.m_projection_std));
 	}
 	else
 	{
-		fov_l = -fov_x / 2;
-		fov_r = fov_x / 2;
-		fov_d = -fov_y / 2;
-		fov_u = fov_y / 2;
-	}
+		fov_x = r_refdef.fov_x;//+sin(cl.time)*5;
+		fov_y = r_refdef.fov_y;//-sin(cl.time+1)*5;
+		fovv_x = r_refdef.fovv_x;
+		fovv_y = r_refdef.fovv_y;
+		if ((r_refdef.flags & RDF_UNDERWATER) && !(r_refdef.flags & RDF_WATERWARP))
+		{
+			fov_x *= 1 + (((sin(cl.time * 4.7) + 1) * 0.015) * r_waterwarp.value);
+			fov_y *= 1 + (((sin(cl.time * 3.0) + 1) * 0.015) * r_waterwarp.value);
+			fovv_x *= 1 + (((sin(cl.time * 4.7) + 1) * 0.015) * r_waterwarp.value);
+			fovv_y *= 1 + (((sin(cl.time * 3.0) + 1) * 0.015) * r_waterwarp.value);
+		}
+		if (fovoverrides)
+		{
+			fov_l = fovoverrides[0];
+			fov_r = fovoverrides[1];
+			fov_d = fovoverrides[2];
+			fov_u = fovoverrides[3];
 
-	Matrix4x4_CM_Projection_Offset(r_refdef.m_projection_std, fov_l, fov_r, fov_d, fov_u, r_refdef.mindist, r_refdef.maxdist, false);
-	Matrix4x4_CM_Projection_Offset(r_refdef.m_projection_view, -fovv_x/2, fovv_x/2, -fovv_y/2, fovv_y/2, r_refdef.mindist, r_refdef.maxdist, false);
+			fov_x = fov_r-fov_l;
+			fov_y = fov_u-fov_d;
+
+			fovv_x = fov_x;
+			fovv_y = fov_y;
+			r_refdef.flipcull = ((fov_u < fov_d)^(fov_r < fov_l))?SHADER_CULL_FLIP:0;
+		}
+		else
+		{
+			fov_l = -fov_x / 2;
+			fov_r = fov_x / 2;
+			fov_d = -fov_y / 2;
+			fov_u = fov_y / 2;
+		}
+
+		if (r_xflip.ival)
+		{
+			float t = fov_l;
+			fov_l = fov_r;
+			fov_r = t;
+			r_refdef.flipcull ^= SHADER_CULL_FLIP;
+			fovv_x *= -1;
+		}
+
+		Matrix4x4_CM_Projection_Offset(r_refdef.m_projection_std, fov_l, fov_r, fov_d, fov_u, r_refdef.mindist, r_refdef.maxdist, false);
+		Matrix4x4_CM_Projection_Offset(r_refdef.m_projection_view, -fovv_x/2, fovv_x/2, -fovv_y/2, fovv_y/2, r_refdef.mindist, r_refdef.maxdist, false);
+	}
 
 	r_refdef.m_projection_view[2+4*0] *= 0.333;
 	r_refdef.m_projection_view[2+4*1] *= 0.333;
@@ -2380,6 +2395,7 @@ void VK_Set2D(void)
 
 	VKBE_Set2D(true);
 
+	r_refdef.flipcull = 0;
 	if (0)
 		Matrix4x4_CM_Orthographic(r_refdef.m_projection_std, 0, vid.fbvwidth, 0, vid.fbvheight, -99999, 99999);
 	else
@@ -2718,7 +2734,7 @@ static qboolean VK_R_RenderScene_Cubemap(struct vk_rendertarg *fb)
 		r_refdef.viewangles[2] = saveang[2]+ang[i][2];
 
 
-		VK_SetupViewPortProjection(true, NULL, NULL);
+		VK_SetupViewPortProjection(true, NULL, NULL, NULL);
 
 		/*if (!vk.rendertarg->depthcleared)
 		{
@@ -2742,11 +2758,11 @@ static qboolean VK_R_RenderScene_Cubemap(struct vk_rendertarg *fb)
 
 		R_SetFrustum (r_refdef.m_projection_std, r_refdef.m_view);
 		RQ_BeginFrame();
-		if (!(r_refdef.flags & RDF_NOWORLDMODEL))
-		{
-			if (cl.worldmodel)
-				P_DrawParticles ();
-		}
+//		if (!(r_refdef.flags & RDF_NOWORLDMODEL))
+//		{
+//			if (cl.worldmodel)
+//				P_DrawParticles ();
+//		}
 		Surf_DrawWorld();
 		RQ_RenderBatchClear();
 
@@ -2799,11 +2815,11 @@ static qboolean VK_R_RenderScene_Cubemap(struct vk_rendertarg *fb)
 	return true;
 }
 
-void VK_R_RenderEye(texid_t image, vec4_t fovoverride, vec3_t eyeangorg[2])
+void VK_R_RenderEye(texid_t image, const pxrect_t *viewport, const vec4_t fovoverride, const float projmatrix[16], const float eyematrix[12])
 {
 	struct vk_rendertarg *rt;
 
-	VK_SetupViewPortProjection(false, eyeangorg, fovoverride);
+	VK_SetupViewPortProjection(false, eyematrix, fovoverride, projmatrix);
 
 	rt = &postproc[postproc_buf++%countof(postproc)];
 	rt->rpassflags |= RP_VR;
@@ -2833,11 +2849,11 @@ void VK_R_RenderEye(texid_t image, vec4_t fovoverride, vec3_t eyeangorg[2])
 
 	R_SetFrustum (r_refdef.m_projection_std, r_refdef.m_view);
 	RQ_BeginFrame();
-	if (!(r_refdef.flags & RDF_NOWORLDMODEL))
-	{
-		if (cl.worldmodel)
-			P_DrawParticles ();
-	}
+//	if (!(r_refdef.flags & RDF_NOWORLDMODEL))
+//	{
+//		if (cl.worldmodel)
+//			P_DrawParticles ();
+//	}
 	Surf_DrawWorld();
 	RQ_RenderBatchClear();
 
@@ -2984,7 +3000,7 @@ void	VK_R_RenderView				(void)
 	}
 	else
 	{
-		VK_SetupViewPortProjection(false, NULL, NULL);
+		VK_SetupViewPortProjection(false, NULL, NULL, NULL);
 
 		if (rt != rtscreen)
 			VKBE_RT_Begin(rt);
@@ -3028,11 +3044,11 @@ void	VK_R_RenderView				(void)
 
 		R_SetFrustum (r_refdef.m_projection_std, r_refdef.m_view);
 		RQ_BeginFrame();
-		if (!(r_refdef.flags & RDF_NOWORLDMODEL))
-		{
-			if (cl.worldmodel)
-				P_DrawParticles ();
-		}
+//		if (!(r_refdef.flags & RDF_NOWORLDMODEL))
+//		{
+//			if (cl.worldmodel)
+//				P_DrawParticles ();
+//		}
 		Surf_DrawWorld();
 		RQ_RenderBatchClear();
 
diff --git a/engine/web/fs_web.c b/engine/web/fs_web.c
index 4c6a0f8e3..f35d377e8 100644
--- a/engine/web/fs_web.c
+++ b/engine/web/fs_web.c
@@ -2,8 +2,6 @@
 #include "fs.h"
 
 #if defined(FTE_TARGET_WEB)
-#include "ftejslib.h"
-
 #define FSWEB_OpenPath VFSOS_OpenPath
 #define FSWEB_OpenTemp FS_OpenTemp
 
diff --git a/engine/web/fte_pwa.json b/engine/web/fte_pwa.json
new file mode 100644
index 000000000..80e23769c
--- /dev/null
+++ b/engine/web/fte_pwa.json
@@ -0,0 +1,41 @@
+{
+	"name": "FTE-In-Browser",
+	"short_name": "FTEQW",
+	"description": "Awesome games in your Web Browser!",
+	"categories": ["games"],
+	"id": "./",
+	"start_url": "./",
+	"display": "standalone",
+	"orientation": "landscape",
+	"icons":
+	[
+    	{
+			"src": "https://fteqw.org/favicon.png",
+			"type": "image/png",
+			"sizes": "128x128"
+    	},
+    	{
+			"src": "icon_144.png",
+			"type": "image/png",
+			"sizes": "144x144"
+    	}
+	],
+	"protocol_handlers":
+	[
+		{
+			"protocol": "web+quake",
+			"url": "./?%s"
+		},
+		{
+			"protocol": "web+qw",
+			"url": "./?%s"
+		}
+	],
+	"serviceworker":
+	{
+		"scope": "./",
+		"src": "./fte_pwa_sw.js",
+		"use_cache": true
+	}
+}
+
diff --git a/engine/web/fte_pwa_sw.js b/engine/web/fte_pwa_sw.js
new file mode 100644
index 000000000..45923c646
--- /dev/null
+++ b/engine/web/fte_pwa_sw.js
@@ -0,0 +1,101 @@
+const addResourcesToCache = async (resources) =>
+{
+	const cache = await caches.open('v1');
+	await cache.addAll(resources);
+};
+
+const putInCache = async (request, response) =>
+{
+	const cache = await caches.open('v1');
+	await cache.put(request, response);
+};
+function shouldcache(name)
+{
+	if (name.indexOf("/raw/"))
+		return false;
+	if (name.indexOf("/downloadables"))
+		return false;
+	return true;
+};
+
+const cacheFirst = async ({ request, preloadResponsePromise }) =>
+{
+	// First try to get the resource from the cache
+	const responseFromCache = await caches.match(request);
+	if (responseFromCache)
+	{
+//		console.log("cacheFirst - from cache", request, preloadResponsePromise, responseFromCache);
+		return responseFromCache;
+	}
+
+	// Next try to use the preloaded response, if it's there
+	const preloadResponse = await preloadResponsePromise;
+	if (preloadResponse)
+	{
+//		console.info('using preload response', preloadResponse);
+		if (shouldcache(request.url))
+			putInCache(request, preloadResponse.clone());
+		return preloadResponse;
+	}
+
+	// Next try to get the resource from the network
+	try
+	{
+		const responseFromNetwork = await fetch(request.clone());
+		// response may be used only once
+		// we need to save clone to put one copy in cache
+		// and serve second one
+		if (shouldcache(request.url))
+			putInCache(request, responseFromNetwork.clone());
+//		console.info('fetching from network', responseFromNetwork);
+		return responseFromNetwork;
+	}
+	catch (error)
+	{
+//		console.info('failure', preloadResponse);
+		// there is nothing we can do, but we must always
+		// return a Response object
+		return new Response('Network error happened',
+		{
+			status: 408,
+			headers: { 'Content-Type': 'text/plain' },
+		});
+	}
+};
+
+const enableNavigationPreload = async () =>
+{
+	if (self.registration.navigationPreload)
+	{
+		// Enable navigation preloads!
+		await self.registration.navigationPreload.enable();
+	}
+};
+
+self.addEventListener('activate', (event) =>
+{
+	event.waitUntil(enableNavigationPreload());
+});
+
+
+self.addEventListener('install', (event) =>
+{
+	event.waitUntil(
+		addResourcesToCache([
+			'./',
+			'./fte_pwa.json',
+			'./fte_pwa_sw.js',
+			'./ftewebgl.js',
+			'./ftewebgl.wasm'
+		])
+	);
+});
+
+self.addEventListener('fetch', (event) =>
+{
+	event.respondWith(cacheFirst(
+	{
+		request: event.request,
+		preloadResponsePromise: event.preloadResponse
+	}));
+});
diff --git a/engine/web/ftejslib.h b/engine/web/ftejslib.h
index b5e9f5538..3ea93069d 100644
--- a/engine/web/ftejslib.h
+++ b/engine/web/ftejslib.h
@@ -17,7 +17,7 @@ unsigned int emscriptenfte_buf_getsize(int handle);			//get the size of the file
 int emscriptenfte_buf_read(int handle, int offset, void *data, int len);//read data
 int emscriptenfte_buf_write(int handle, int offset, const void *data, int len);//write data. no access checks.
 void emscritenfte_buf_enumerate(void (*Sys_EnumeratedFile)(void *ctx, size_t fsize), void *ctx, size_t namesize);
-
+void emscriptenfte_openfile(void);
 
 //websocket is implemented in javascript because there is no usable C api (emscripten's javascript implementation is shite and has fatal errors).
 int emscriptenfte_ws_connect(const char *url, const char *wsprotocol);	//open a websocket connection to a specific host
@@ -40,6 +40,7 @@ NORETURN void emscriptenfte_abortmainloop(const char *caller, int fatal);
 //to use such textures/sounds, we can just 'directly' load them via webgl
 void emscriptenfte_gl_loadtexturefile(int gltexid, int *width, int *height, void *data, int datasize, const char *fname, int premul, int genmips);
 void emscriptenfte_al_loadaudiofile(int al_buf, void *data, int datasize);
+int emscriptenfte_pcm_loadaudiofile(void *ctx, void(*callbackfunc)(void *ctx, void *dataptr, int frames, int channels, float rate), void *dataptr, size_t datasize, int snd_speed);
 
 //avoid all of emscripten's sdl emulation.
 //this resolves input etc issues.
@@ -57,11 +58,26 @@ int emscriptenfte_setupcanvas(
 	int(*Keyboard)(unsigned int devid, int down, int keycode, int unicode),
 	void(*LoadFile)(char *url, char *mime, int filehandle),
 	void(*CbufAdd)(const char *text),
-	void(*buttonevent)(unsigned int joydev, int button, int ispressed, int isstandard),
-	void(*axisevent)(unsigned int joydev, int axis, float value, int isstandard),
+	void(*buttonevent)(int joydev, int button, int ispressed, int isstandard),
+	void(*axisevent)(int joydev, int axis, float value, int isstandard),
+	void(*orientation)(int joydev, float px,float py,float pz, float qx,float qy,float qz,float qw),
 	int (*ShouldSwitchToFullscreen)(void)
 	);
 
-int emscriptenfte_getvrframedata(void);
-int emscriptenfte_getvreyedata(int eye, float *projectionmatrix, float *viewmatrix);
-
+struct webxrinfo_s {
+	int fbo;	//panic!
+	int viewport[4];
+	float projmatrix[16];
+	float transform[16];
+};
+int emscriptenfte_xr_geteyeinfo(int maxeyes, struct webxrinfo_s *vreyes);
+unsigned int emscriptenfte_xr_issupported(void);		//0 for can't support it, -1 for unknown support, otherwise bitmask of supported modes
+int emscriptenfte_xr_isactive(void);	//true if we're actually using webvr or not.
+void emscriptenfte_xr_setup(int mode);
+	#define WXRM_TOGGLE -3
+	#define WXRM_AUTO -2
+	#define WXRM_DISABLE -1
+	#define WXRM_INLINE 0
+	#define WXRM_VR 1
+	#define WXRM_AR 2
+void emscriptenfte_xr_shutdown(void);
diff --git a/engine/web/ftejslib.js b/engine/web/ftejslib.js
index 05d288812..564ebf1d8 100644
--- a/engine/web/ftejslib.js
+++ b/engine/web/ftejslib.js
@@ -72,6 +72,12 @@ mergeInto(LibraryManager.library,
 		clipboard:"",
 		linebuffer:'',
 		localstorefailure:false,
+		dovsync:false,
+		wakelock:null,
+		xrsupport:-1,
+		xrsession:null,
+		xrframe:null,
+		referenceSpace:null,
 		w: -1,
 		h: -1,
 		donecb:0,
@@ -84,6 +90,7 @@ mergeInto(LibraryManager.library,
 			cbufaddtext:0,
 			jbutton:0,
 			jaxis:0,
+			jorientation:0,
 			wantfullscreen:0,
 			frame:0
 		},
@@ -123,22 +130,45 @@ mergeInto(LibraryManager.library,
 
 		step : function(timestamp)
 		{
-			var dovsync = false;
 			if (FTEC.aborted)
 				return;
 
+			//do this first in the hope that it'll make firefox a smidge smoother.
+			if (FTEC.dovsync)
+				Browser.requestAnimationFrame(FTEC.step);
+			else
+				setTimeout(FTEC.step, 0, performance.now());
+
+			if (FTEC.xrsession)
+				return;	//keep ticking, cos its safer. :\
+
 			try	//this try is needed to handle Host_EndGame properly.
 			{
-				dovsync = {{{makeDynCall('if','FTEC.evcb.frame')}}}(timestamp);
+				FTEC.dovsync = {{{makeDynCall('if','FTEC.evcb.frame')}}}(timestamp);
 			}
 			catch(err)
 			{
 				console.log(err);
 			}
-			if (dovsync)
-				Browser.requestAnimationFrame(FTEC.step);
-			else
-				setTimeout(FTEC.step, 0, performance.now());
+		},
+		doxrframe : function(timestamp, frame)
+		{
+			if (FTEC.aborted || FTEC.xrsession == null)
+				return;
+
+			//do this first in the hope that it'll make firefox a smidge smoother.
+			FTEC.xrsession.requestAnimationFrame(FTEC.doxrframe);
+
+			FTEC.xrframe = frame;
+			try	//this try is needed to handle Host_EndGame properly.
+			{
+				FTEC.dovsync = {{{makeDynCall('if','FTEC.evcb.frame')}}}(timestamp);
+			}
+			catch(err)
+			{
+				console.log(err);
+			}
+			FTEC.xrframe = null;
 		},
 
 		handleevent : function(event)
@@ -182,9 +212,49 @@ mergeInto(LibraryManager.library,
 					break;
 				case 'mousedown':
 					window.focus();
-					//older browsers need fullscreen in order for requestPointerLock to work.
-					//newer browsers can still break pointer locks when alt-tabbing, even without breaking fullscreen.
-					//so lets spam requests for it
+					//Mozilla docs say do the pointerlock request first...
+					//older browsers only allowed pointer lock when fullscreen. maybe it'll need two clicks. sucks to be you.
+					if (FTEC.pointerwantlock != 0 && FTEC.pointerislocked == 0)
+					{
+						var v;
+						try
+						{
+							FTEC.pointerislocked = -1;  //don't repeat the request on every click. firefox has a fit at that, so require the mouse to leave the element or something before we retry.
+							v = Module['canvas'].requestPointerLock({unadjustedMovement: true});
+							if (v !== undefined)
+							{	//fuck sake, this is chrome being shitty.
+								//this is all bullshit.
+								//requestPointerLock spec does not return a promise. but chrome does it anyway, and returns its errors that way. and it eerrors a LOT, in system-specific ways, resulting in pointer locks failing entirely.
+								v.catch((e)=>
+								{
+									if (e.name == "NotSupportedError")
+									{
+										Module['canvas'].requestPointerLock().then(()=>{
+											console.log("Shitty browser forces mouse accel. Expect a shit experience.");
+										}).catch(()=>{
+											console.log("Your defective browser forces can't handle mouse look. Expect a truely dire experience. Give up now.");
+										});
+									}
+									else
+										console.log("Your defective browser forces can't handle mouse look. Expect a truely dire experience. Give up now.");
+								});
+							}
+						}
+						catch(e)
+						{
+							try {
+								Module['canvas'].requestPointerLock();
+								console.log("Your shitty browser doesn't support disabling mouse acceleration.");
+							}
+							catch(e)
+							{
+								console.log("Your shitty browser doesn't support mouse grabs.");
+								FTEC.pointerislocked = -1;  //don't repeat the request on every click. firefox has a fit at that, so require the mouse to leave the element or something before we retry.
+							}
+						}
+					}
+					//older browsers need fullscreen in order for requestPointerLock to work. Which seems to be deprecated cos of how shitty an experience it is whenever you hit escape to load a menu or w/e
+					//newer browsers can still break pointer locks when alt-tabbing, even without breaking fullscreen, so lets spam requests for it. enjoy.
 					if (!document.fullscreenElement)
 						if (FTEC.evcb.wantfullscreen != 0)
 							if ({{{makeDynCall('i','FTEC.evcb.wantfullscreen')}}}())
@@ -199,17 +269,6 @@ mergeInto(LibraryManager.library,
 									console.log(e);
 								}
 							}
-					if (FTEC.pointerwantlock != 0 && FTEC.pointerislocked == 0)
-					{
-						FTEC.pointerislocked = -1;  //don't repeat the request on every click. firefox has a fit at that, so require the mouse to leave the element or something before we retry.
-						Module['canvas'].requestPointerLock({unadjustedMovement: true}).catch(()=>{
-							Module['canvas'].requestPointerLock().then(()=>{
-								console.log("Your shitty browser doesn't support disabling mouse acceleration.");
-							}).catch(()=>{
-								FTEC.pointerislocked = 0;	//failure. no real idea why. try again next frame though...
-							});
-						});
-					}
 					//fallthrough
 				case 'mouseup':
 					if (FTEC.evcb.button != 0)
@@ -229,12 +288,18 @@ mergeInto(LibraryManager.library,
 				case 'mouseout':
 					if (FTEC.evcb.button != 0)
 					{
-						for (var i = 0; i < 8; i++)	
+						for (let i = 0; i < 8; i++)
 							{{{makeDynCall('viii','FTEC.evcb.button')}}}(0, false, i);
 					}
 					if (FTEC.pointerislocked == -1)
 						FTEC.pointerislocked = 0;
 					break;
+				case 'visibilitychange':
+					try{
+						if (!FTEC.wakelock && navigator.wakeLock && document.visibilityState === "visible")
+							navigator.wakeLock.request("screen").then((value)=>{FTEC.wakelock = value;value.addEventListener("release", ()=>{FTEC.wakelock=null;});}).catch(()=>{});
+					}catch(e){console.log(e);}
+					break;
 				case 'focus':
 				case 'blur':
 					{{{makeDynCall('iiiii','FTEC.evcb.key')}}}(0, false, 16, 0); //shift
@@ -260,7 +325,7 @@ mergeInto(LibraryManager.library,
 					//we don't steal that because its impossible to leave it again once used.
 					if (FTEC.evcb.key != 0 && event.keyCode != 122)
 					{
-						var codepoint = event.key.codePointAt(1)?0:event.key.codePointAt(0); // only if its a single codepoint - none of this 'Return' nonsense.
+						const codepoint = event.key.codePointAt(1)?0:event.key.codePointAt(0); // only if its a single codepoint - none of this 'Return' nonsense.
 						if (codepoint < ' ') codepoint = 0; //don't give a codepoint for c0 chars - like tab.
 						if ({{{makeDynCall('iiiii','FTEC.evcb.key')}}}(0, event.type=='keydown', event.keyCode, codepoint))
 							event.preventDefault();
@@ -272,10 +337,10 @@ mergeInto(LibraryManager.library,
 				case 'touchleave':
 				case 'touchmove':
 					event.preventDefault();
-					var touches = event.changedTouches;
-					for (var i = 0; i < touches.length; i++)
+					const touches = event.changedTouches;
+					for (let i = 0; i < touches.length; i++)
 					{
-						var t = touches[i];
+						const t = touches[i];
 						if (FTEC.evcb.mouse)
 							{{{makeDynCall('viiffff','FTEC.evcb.mouse')}}}(t.identifier+1, true, t.pageX, t.pageY, 0, Math.sqrt(t.radiusX*t.radiusX+t.radiusY*t.radiusY));
 						if (FTEC.evcb.button)
@@ -295,35 +360,39 @@ mergeInto(LibraryManager.library,
 				case 'drop':
 					event.stopPropagation();
 					event.preventDefault();
-					var files = event.dataTransfer.files;
-					for (var i = 0; i < files.length; i++)
+					let files = event.dataTransfer.files;
+					for (let i = 0; i < files.length; i++)
 					{
-						var file = files[i];
-						var reader = new FileReader();
+						const file = files[i];
+						const reader = new FileReader();
 						reader.onload = function(evt)
 						{
-							FTEC.loadurl(file.name, "", evt.target.result);
+							FTEC.loadurl(files[i].name, "", evt.target.result);
 						};
 						reader.readAsArrayBuffer(file);
 					}
 					break;
 				case 'gamepadconnected':
-					var gp = e.gamepad;
-					if (FTEH.gamepads === undefined)
-						FTEH.gamepads = [];
-					FTEH.gamepads[gp.index] = gp;
-					console.log("Gamepad connected at index %d: %s. %d buttons, %d axes.", gp.index, gp.id, gp.buttons.length, gp.axes.length);
+					{
+						const gp = e.gamepad;
+						if (FTEH.gamepads === undefined)
+							FTEH.gamepads = [];
+						FTEH.gamepads[gp.index] = gp;
+						console.log("Gamepad connected at index %d: %s. %d buttons, %d axes.", gp.index, gp.id, gp.buttons.length, gp.axes.length);
+					}
 					break;
 				case 'gamepaddisconnected':
-					var gp = e.gamepad;
-					delete FTEH.gamepads[gp.index];
-					if (FTEC.evcb.jaxis)	//try and clear out the axis when released.
-						for (var j = 0; j < 6; j+=1)
-							{{{makeDynCall('viifi','FTEC.evcb.jaxis')}}}(gp.index, j, 0, true);
-					if (FTEC.evcb.jbutton)	//try and clear out the axis when released.
-						for (var j = 0; j < 32+4; j+=1)
-							{{{makeDynCall('viiii','FTEC.evcb.jbutton')}}}(gp.index, j, 0, true);
-					console.log("Gamepad disconnected from index %d: %s", gp.index, gp.id);
+					{
+						const gp = e.gamepad;
+						delete FTEH.gamepads[gp.index];
+						if (FTEC.evcb.jaxis)	//try and clear out the axis when released.
+							for (let j = 0; j < 6; j+=1)
+								{{{makeDynCall('viifi','FTEC.evcb.jaxis')}}}(gp.index, j, 0, true);
+						if (FTEC.evcb.jbutton)	//try and clear out the axis when released.
+							for (let j = 0; j < 32+4; j+=1)
+								{{{makeDynCall('viiii','FTEC.evcb.jbutton')}}}(gp.index, j, 0, true);
+						console.log("Gamepad disconnected from index %d: %s", gp.index, gp.id);
+					}
 					break;
 				case 'pointerlockerror':
 				case 'pointerlockchange':
@@ -332,7 +401,7 @@ mergeInto(LibraryManager.library,
 					FTEC.pointerislocked =	document.pointerLockElement === Module['canvas'] ||
 											document.mozPointerLockElement === Module['canvas'] ||
 											document.webkitPointerLockElement === Module['canvas'];
-					console.log("Pointer lock now " + FTEC.pointerislocked);
+//					console.log("Pointer lock now " + FTEC.pointerislocked);
 					break;
 					
 				case 'beforeunload':
@@ -370,37 +439,130 @@ mergeInto(LibraryManager.library,
 //		if (FTEH.gamepads !== undefined)
 //			gamepads = FTEH.gamepads;
 //		else
-			gamepads = navigator.getGamepads ? navigator.getGamepads() : (navigator.webkitGetGamepads ? navigator.webkitGetGamepads : []);
+			gamepads = navigator.getGamepads ? navigator.getGamepads() : [];
 
 		if (gamepads !== undefined)
-		for (var i = 0; i < gamepads.length; i+=1)
 		{
-			var gp = gamepads[i];
-			if (gp === undefined)
-				continue;
-			if (gp == null)
-				continue;
-			for (var j = 0; j < gp.buttons.length; j+=1)
+			for (var i = 0; i < gamepads.length; i+=1)
 			{
-				var b = gp.buttons[j];
-				var p;
-				if (typeof(b) == "object")
-					p = b.pressed;	//.value is a fractional thing. oh well.
-				else
-					p = b > 0.5;	//old chrome bug
+				const gp = gamepads[i];
+				if (gp === undefined)
+					continue;
+				if (gp == null)
+					continue;	//xbox controllers tend to have 4 and exactly 4. on the plus side indexes won't change.
+				for (var j = 0; j < gp.buttons.length; j+=1)
+				{
+					var b = gp.buttons[j];
+					var p;
+					if (typeof(b) == "object")
+						p = b.pressed;	//.value is a fractional thing. oh well.
+					else
+						p = b > 0.5;	//old chrome bug
 
-				if (b.lastframe != p)
-				{	//cache it to avoid spam
-					b.lastframe = p;
-					{{{makeDynCall('viiii','FTEC.evcb.jbutton')}}}(gp.index, j, p, gp.mapping=="standard");
+					if (b.lastframe != p)
+					{	//cache it to avoid spam
+						b.lastframe = p;
+						{{{makeDynCall('viiii','FTEC.evcb.jbutton')}}}(gp.index, j, p, gp.mapping=="standard");
+					}
+				}
+				for (var j = 0; j < gp.axes.length; j+=1)
+					{{{makeDynCall('viifi','FTEC.evcb.jaxis')}}}(gp.index, j, gp.axes[j], gp.mapping=="standard");
+			}
+		}
+
+		if (FTEC.xrsession != null && FTEC.xrframe != null && FTEC.referenceSpace != null)
+		{
+			//try and figure out the head angles according to where we're told the eyes are
+			var count = 0;
+			var org={x:0,y:0,z:0}, quat={x:0,y:0,z:0,w:0};
+			const pose = FTEC.xrframe.getViewerPose(FTEC.referenceSpace);
+			if (pose)
+			{
+				for (var view of pose.views)
+				{
+					org.x += view.transform.position.x;
+					org.y += view.transform.position.y;
+					org.z += view.transform.position.z;
+					quat.x += view.transform.orientation.x;
+					quat.y += view.transform.orientation.y;
+					quat.z += view.transform.orientation.z;
+					quat.w += view.transform.orientation.w;
+					count++;
+				}
+				if (count)
+				{
+					org.x /= count;
+					org.y /= count;
+					org.z /= count;
+					quat.x /= count;
+					quat.y /= count;
+					quat.z /= count;
+					quat.w /= count;
+
+//const idx=-3;
+//console.log("jorientation dev:" + idx + " org:"+org.x+","+org.y+","+org.z+" quat:"+quat.x+","+quat.y+","+quat.z+","+quat.w);
+					{{{makeDynCall('vifffffff','FTEC.evcb.jorientation')}}}(-3, org.x,org.y,org.z, quat.x,quat.y,quat.z,quat.w);
+				}
+			}
+
+			for (const is of FTEC.xrsession.inputSources)
+			{
+				if (is === undefined || is == null)
+					continue;
+
+				//webxr doesn't really do indexes, so make em up from hands..
+				var idx;
+				if (is.handedness == "right")	//is.targetRayMode=="tracked-pointer"
+					idx = -1;
+				else if (is.handedness == "left")	//is.targetRayMode=="tracked-pointer"
+					idx = -2;
+				//else if (is.handedness == "head")	//is.targetRayMode=="???"... handled above.
+				//	idx = -3;
+				else if (is.handedness == "none" && (is.targetRayMode=="gaze" || is.targetRayMode=="screen"))
+					idx = -4;
+				else
+					continue;	//wut?
+
+				//tell the engine its orientation.
+				const targetRayPose = FTEC.xrframe.getPose(is.targetRaySpace, FTEC.referenceSpace);
+				if (targetRayPose)
+				{
+					const org = targetRayPose.transform.position;
+					const quat = targetRayPose.transform.orientation;
+//console.log("jorientation dev:" + idx + " org:"+org.x+","+org.y+","+org.z+" quat:"+quat.x+","+quat.y+","+quat.z+","+quat.w);
+					{{{makeDynCall('vifffffff','FTEC.evcb.jorientation')}}}(idx, org.x,org.y,org.z, quat.x,quat.y,quat.z,quat.w);
+				}
+
+				//if it has a usable gamepad then use it.
+				const gp = is.gamepad;
+				if (gp == null)
+					continue;
+				if (gp.mapping != "xr-standard")
+					continue;
+
+				for (var j = 0; j < gp.buttons.length; j+=1)
+				{
+					var b = gp.buttons[j];
+					var p;
+					p = b.pressed;	//.value is a fractional thing. oh well.
+
+					if (b.lastframe != p)
+					{	//cache it to avoid spam
+						b.lastframe = p;
+console.log("jbutton dev:" + idx + " btn:"+j+" dn:"+p+" mapping:"+gp.mapping);
+						{{{makeDynCall('viiii','FTEC.evcb.jbutton')}}}(idx, j, p, gp.mapping=="standard");
+					}
+				}
+				for (var j = 0; j < gp.axes.length; j+=1)
+				{
+console.log("jaxis dev:" + idx + " axis:"+j+" val:"+gp.axes[j]+" mapping:"+gp.mapping);
+					{{{makeDynCall('viifi','FTEC.evcb.jaxis')}}}(idx, j, gp.axes[j], gp.mapping=="standard");
 				}
 			}
-			for (var j = 0; j < gp.axes.length; j+=1)
-				{{{makeDynCall('viifi','FTEC.evcb.jaxis')}}}(gp.index, j, gp.axes[j], gp.mapping=="standard");
 		}
 	},
 	emscriptenfte_setupcanvas__deps: ['$FTEC', '$Browser', 'emscriptenfte_buf_createfromarraybuf'],
-	emscriptenfte_setupcanvas : function(nw,nh,evresize,evmouse,evmbutton,evkey,evfile,evcbufadd,evjbutton,evjaxis,evwantfullscreen)
+	emscriptenfte_setupcanvas : function(nw,nh,evresize,evmouse,evmbutton,evkey,evfile,evcbufadd,evjbutton,evjaxis,evjorientation,evwantfullscreen)
 	{
 		try
 		{
@@ -412,6 +574,7 @@ mergeInto(LibraryManager.library,
 		FTEC.evcb.cbufaddtext = evcbufadd;
 		FTEC.evcb.jbutton = evjbutton;
 		FTEC.evcb.jaxis = evjaxis;
+		FTEC.evcb.jorientation = evjorientation;
 		FTEC.evcb.wantfullscreen = evwantfullscreen;
 
 		if ('GamepadEvent' in window)
@@ -433,13 +596,13 @@ mergeInto(LibraryManager.library,
 			});
 
 			var docevents = ['keypress', 'keydown', 'keyup',
-							'pointerlockerror', 'pointerlockchange', 'mozpointerlockchange', 'webkitpointerlockchange'];
+							'pointerlockerror', 'pointerlockchange', 'mozpointerlockchange', 'webkitpointerlockchange', 'visibilitychange'];
 			docevents.forEach(function(event)
 			{
 				document.addEventListener(event, FTEC.handleevent, true);
 			});
 
-			var windowevents = ['message','gamepadconnected', 'gamepaddisconnected', 'beforeunload'];
+			var windowevents = ['message','gamepadconnected', 'gamepaddisconnected', 'beforeunload', 'focus', 'blur'];
 			windowevents.forEach(function(event)
 			{
 				window.addEventListener(event, FTEC.handleevent, true);
@@ -451,7 +614,7 @@ mergeInto(LibraryManager.library,
 //				});
 //			});
 		}
-		var ctx = Browser.createContext(Module['canvas'], true, true);
+		var ctx = Browser.createContext(Module['canvas'], true, true, {});
 		if (ctx == null)
 		{
 			var msg = "Unable to set up webgl context.\n\nPlease use a browser that supports it and has it enabled\nYour graphics drivers may also be blacklisted, so try updating those too. woo, might as well update your entire operating system while you're at it.\nIt'll be expensive, but hey, its YOUR money, not mine.\nYou can probably just disable the blacklist, but please don't moan at me when your computer blows up, seriously, make sure those drivers are not too buggy.\nI knew a guy once. True story. Boring, but true.\nYou're probably missing out on something right now. Don't you just hate it when that happens?\nMeh, its probably just tinkertoys, right?\n\nYou know, you could always try Internet Explorer, you never know, hell might have frozen over.\nDon't worry, I wasn't serious.\n\nTum te tum. Did you get it working yet?\nDude, fix it already.\n\nThis message was brought to you by Sleep Deprivation, sponsoring quake since I don't know when";
@@ -490,15 +653,210 @@ mergeInto(LibraryManager.library,
 				FTEC.loadurl(location.hash.substring(1), "", undefined);
 			};
 		}
-		
-		_emscriptenfte_updatepointerlock(false, false);
+
+		//try to grab the mouse if we can
+		try{
+			_emscriptenfte_updatepointerlock(false, false);
+		}catch(e){console.log(e);}
+
+		//stop the screen from turning off.
+
+		try{
+			if (!FTEC.wakelock && navigator.wakeLock)
+				navigator.wakeLock.request("screen").then((value)=>{FTEC.wakelock = value;value.addEventListener("release", ()=>{FTEC.wakelock=null;});}).catch(()=>{});
+		}catch(e){console.log(e);}
+
 		} catch(e)
 		{
 		console.log(e);
 		}
 
+		FTEC.xrsupport = 0;
+		if (navigator.xr)
+		{
+			function rechecksupport()
+			{
+				navigator.xr.isSessionSupported("inline",		{}).then((works) => {FTEC.xrsupport = ((FTEC.xrsupport&~1)<<0)|(works<<0);});
+				navigator.xr.isSessionSupported("immersive-vr",	{}).then((works) => {FTEC.xrsupport = ((FTEC.xrsupport&~1)<<1)|(works<<1);});
+				navigator.xr.isSessionSupported("immersive-ar",	{}).then((works) => {FTEC.xrsupport = ((FTEC.xrsupport&~1)<<2)|(works<<2);});
+			};
+
+			//check it now
+			rechecksupport();
+
+			//and keep it up to date.
+			navigator.xr.addEventListener('devicechange', (e)=>{rechecksupport();});
+		}
+
 		return 1;
 	},
+	emscriptenfte_xr_issupported : function()
+	{
+		if (navigator.xr)
+			return FTEC.xrsupport;
+		return 0;
+	},
+	emscriptenfte_xr_isactive : function()
+	{
+		var ret = 0;
+		if (FTEC.xrsession!=null)
+		{
+			ret |= 1;
+
+			const pose = FTEC.xrframe.getViewerPose(FTEC.referenceSpace);
+			if (pose.views.length)
+				ret |= 2;
+		}
+		return ret;
+	},
+	emscriptenfte_xr_setup : function(mode)
+	{
+		if (mode == -3)
+			mode = ((FTEC.xrsession!=null)?-1:-2);
+		if (mode == -2)
+		{	//pick some suitable mode
+			if (FTEC.xrsupport & (1<<2))
+				mode = 2;	//ar
+			else if (FTEC.xrsupport & (1<<1))
+				mode = 1;	//vr
+			else if (FTEC.xrsupport & (1<<0))
+				mode = 0;	//inline
+		}
+		if (mode == -1)	//kill any current session.
+			_emscriptenfte_xr_shutdown();
+		else if (FTEC.xrsession == null && navigator.xr && mode >= 0 && mode < 3)
+		{
+			const modes = ["inline", "immersive-vr", "immersive-ar"];
+			navigator.xr.requestSession(modes[mode], {optionalFeatures:["local"]}).then((session) => {
+				FTEC.xrsession = session;
+
+				session.addEventListener('end', ()=>{console.log("Session ended"); _emscriptenfte_xr_shutdown();});
+				session.addEventListener('inputsourcechange', (e)=>{console.log("inputsourcechange", e);});
+				session.addEventListener('select', (e)=>{console.log("select", e);});
+				session.addEventListener('selectstart', (e)=>{console.log("selectstart", e);});
+				session.addEventListener('selectend', (e)=>{console.log("selectend", e);});
+				session.addEventListener('squeeze', (e)=>{console.log("squeeze", e);});
+				session.addEventListener('squeezestart', (e)=>{console.log("squeezestart", e);});
+				session.addEventListener('squeezeend', (e)=>{console.log("squeezeend", e);});
+
+				/*Module['canvas'].addEventListener("webglcontextlost", (event) => {
+					event.canceled = true;
+					console.log("webglcontextlost");
+				});
+				Module['canvas'].addEventListener("webglcontextrestored", (event) => {
+					console.log("webglcontextrestored");
+				});*/
+
+				var madecompatible = function()
+				{
+					session.updateRenderState({baseLayer: new XRWebGLLayer(session, Module.ctx), depthFar:8192, depthNear:1});
+
+					session.requestReferenceSpace("local").then((refspace) => {
+						FTEC.referenceSpace = refspace;
+						FTEC.xrsession.requestAnimationFrame(FTEC.doxrframe);
+					}).catch((e)=>{	//fall back to viewer if that failed.
+						session.requestReferenceSpace("viewer").then((refspace) => {
+							FTEC.referenceSpace = refspace;
+							FTEC.xrsession.requestAnimationFrame(FTEC.doxrframe);
+						}).catch((e)=>{console.error("requestReferenceSpace",e); _emscriptenfte_xr_shutdown();});	//and just in case...
+					});
+				};
+
+				if (mode == 0)
+					madecompatible();	//chrome88+ throws a hissy fit if we makeXRCompatible on an inline context.
+				else
+					Module.ctx.makeXRCompatible().then(madecompatible).catch((e)=>{console.error("makeXRCompatible", e);_emscriptenfte_xr_shutdown();});
+			}).catch((e)=>{console.error("requestSession", e);_emscriptenfte_xr_shutdown();});
+			return true;
+        }
+        return false;   //not really success, more that it can't possibly work.
+	},
+	emscriptenfte_xr_geteyeinfo : function(maxeyes, eyeptr)
+	{
+		if (!FTEC.xrframe || !FTEC.xrsession)
+			return 0;	//nope.
+
+		const pose = FTEC.xrframe.getViewerPose(FTEC.referenceSpace);
+		if (!pose)
+			return 0;	//nope.
+		const layer = FTEC.xrsession.renderState.baseLayer;
+		var e = 0;
+
+		if (!FTEC.xrfbo)	//make the fbo handle available to the C code
+			FTEC.xrfbo = GL.framebuffers.length;	//alloc a new one.
+		GL.framebuffers[FTEC.xrfbo] = layer.framebuffer;	//update it so the engine can actually use it...
+
+		eyeptr>>=2;
+		for (const view of pose.views)
+		{
+			if (e == maxeyes)
+				break;
+			const viewport = layer.getViewport(view);
+
+			HEAP32[eyeptr+0] = FTEC.xrfbo;
+			eyeptr+=1;
+
+			HEAP32[eyeptr+0] = viewport.x;
+			HEAP32[eyeptr+1] = viewport.y;
+			HEAP32[eyeptr+2] = viewport.width;
+			HEAP32[eyeptr+3] = viewport.height;
+			eyeptr+=4;
+
+			HEAPF32[eyeptr+ 0] = view.projectionMatrix[0];
+			HEAPF32[eyeptr+ 1] = view.projectionMatrix[1];
+			HEAPF32[eyeptr+ 2] = view.projectionMatrix[2];
+			HEAPF32[eyeptr+ 3] = view.projectionMatrix[3];
+			HEAPF32[eyeptr+ 4] = view.projectionMatrix[4];
+			HEAPF32[eyeptr+ 5] = view.projectionMatrix[5];
+			HEAPF32[eyeptr+ 6] = view.projectionMatrix[6];
+			HEAPF32[eyeptr+ 7] = view.projectionMatrix[7];
+			HEAPF32[eyeptr+ 8] = view.projectionMatrix[8];
+			HEAPF32[eyeptr+ 9] = view.projectionMatrix[9];
+			HEAPF32[eyeptr+10] = view.projectionMatrix[10];
+			HEAPF32[eyeptr+11] = view.projectionMatrix[11];
+			HEAPF32[eyeptr+12] = view.projectionMatrix[12];
+			HEAPF32[eyeptr+13] = view.projectionMatrix[13];
+			HEAPF32[eyeptr+14] = view.projectionMatrix[14];
+			HEAPF32[eyeptr+15] = view.projectionMatrix[15];
+			eyeptr+=16;
+
+			HEAPF32[eyeptr+ 0] = view.transform.matrix[0];
+			HEAPF32[eyeptr+ 1] = view.transform.matrix[1];
+			HEAPF32[eyeptr+ 2] = view.transform.matrix[2];
+			HEAPF32[eyeptr+ 3] = view.transform.matrix[3];
+			HEAPF32[eyeptr+ 4] = view.transform.matrix[4];
+			HEAPF32[eyeptr+ 5] = view.transform.matrix[5];
+			HEAPF32[eyeptr+ 6] = view.transform.matrix[6];
+			HEAPF32[eyeptr+ 7] = view.transform.matrix[7];
+			HEAPF32[eyeptr+ 8] = view.transform.matrix[8];
+			HEAPF32[eyeptr+ 9] = view.transform.matrix[9];
+			HEAPF32[eyeptr+10] = view.transform.matrix[10];
+			HEAPF32[eyeptr+11] = view.transform.matrix[11];
+			HEAPF32[eyeptr+12] = view.transform.matrix[12];
+			HEAPF32[eyeptr+13] = view.transform.matrix[13];
+			HEAPF32[eyeptr+14] = view.transform.matrix[14];
+			HEAPF32[eyeptr+15] = view.transform.matrix[15];
+			eyeptr+=16;
+
+			e++;
+		}
+		return e;
+	},
+	emscriptenfte_xr_shutdown : function()
+	{
+		if (FTEC.xrfbo)
+		{	//destroy that handle
+			GL.framebuffers[FTEC.xrfbo] = null;
+			FTEC.xrfbo = 0;
+		}
+
+		if (FTEC.xrsession)
+		{
+			FTEC.xrsession.end();
+			FTEC.xrsession = null;
+		}
+		FTEC.xrframe = null;
+	},
 	emscriptenfte_settitle : function(txt)
 	{
 		document.title = UTF8ToString(txt);
@@ -517,12 +875,32 @@ mergeInto(LibraryManager.library,
 	emscriptenfte_setupmainloop : function(fnc)
 	{
 		Module['noExitRuntime'] = true;
-		FTEC.aborted = false;
+		FTEC.aborted = fnc==0;
+
+		Module["sched"] = FTEC.step;	//this is stupid.
 
-		Module["sched"] = FTEC.step;
 		FTEC.evcb.frame = fnc;
-		//don't start it instantly, so we can distinguish between types of errors (emscripten sucks!).
-		setTimeout(FTEC.step, 1, performance.now());
+		if (fnc)
+		{
+			//don't start it instantly, so we can distinguish between types of errors (emscripten sucks!).
+			setTimeout(FTEC.step, 1, performance.now());
+		}
+		else if (Module["close"])
+			Module["close"]();
+		else
+		{
+			try
+			{
+				if (history.length == 1)
+					window.close();
+				else
+					history.back();	//can't close. go back to the previous page though.
+			}
+			catch(e)
+			{
+			}
+		}
+		//else kill it?
 	},
 
 	emscriptenfte_ticks_ms : function()
@@ -534,6 +912,71 @@ mergeInto(LibraryManager.library,
 		return performance.now();
 	},
 
+	emscriptenfte_openfile : function()
+	{
+		if (FTEC.evcb.loadfile != 0)
+		{
+			window.showOpenFilePicker(
+				{	types:[
+						{
+							description: "Packages",
+							accept:{"text/*":[".pk3", ".pak", ".pk4", ".zip"]}
+						},
+						{
+							description: "Maps",
+							accept:{"text/*":[".bsp.gz", ".bsp", ".map", ".hmp"]}
+						},
+						{
+							description: "Demos",
+							accept:{"application/*":[".mvd.gz", ".qwd.gz", ".dem.gz", ".mvd", ".qwd", ".dem"]}	//dm2?
+						},
+						{
+							description: "QuakeTV Info",
+							accept:{"application/*":[".qtv"]}
+						},
+						{
+							description: "FTE Manifest",
+							accept:{"text/*":[".fmf"]}
+						},
+						//model formats?... nah, too many/weird. they can always
+						//audio formats?	eww
+						//image formats?	double eww!
+						{
+							description: "Configs",
+							accept:{"text/*":[".cfg", ".rc"]}
+						}],
+					excludeAcceptAllOption:false,	//let em pick anything. we actually support more than listed here (and bitrot...)
+					id:"openfile",	//remember the dir we were in for the next invocation
+					multiple:true	//does this make sense? not for a demo but does for *.pak or *.bsp
+				}).then((r)=>
+				{
+					for (let i of r)
+					{
+						i.getFile().then((f)=>
+						{
+							f.arrayBuffer().then((arraybuf)=>
+							{
+								if (FTEC.evcb.loadfile != 0)
+								{
+									const handle = _emscriptenfte_buf_createfromarraybuf(arraybuf);
+									let blen = lengthBytesUTF8(i.name)+1;
+									let urlptr = _malloc(blen);
+									stringToUTF8(f.name, urlptr, blen);
+									blen = lengthBytesUTF8(f.type)+1;
+									let mimeptr = _malloc(blen);
+									stringToUTF8(f.type, mimeptr,blen);
+									{{{makeDynCall('viii','FTEC.evcb.loadfile')}}}(urlptr, mimeptr, handle);
+									_free(mimeptr);
+									_free(urlptr);
+									window.focus();
+								}
+							});
+						}).catch((e)=>{console.error("getFile() failed:");console.error(e);});
+					}
+				}).catch((e)=>{console.log("showOpenFilePicker() aborted", e);});
+		}
+	},
+
 	emscriptenfte_buf_create__deps : ['emscriptenfte_handle_alloc'],
 	emscriptenfte_buf_create : function()
 	{
@@ -615,6 +1058,22 @@ mergeInto(LibraryManager.library,
 		FTEH.f[newname] = f;
 		delete FTEH.f[oldname];
 		f.n = newname;
+
+		if (Module['cache'])
+		{
+			Module['cache'].match("/_/"+oldname).then((oldresp)=>{
+				if (oldresp === undefined)
+					Module['cache'].delete("/_/"+newname);	//'overwrite' the new name.
+				else
+				{
+					Module['cache'].put("/_/"+newname, oldresp);
+					Module['cache'].delete("/_/"+oldname);
+				}
+			}).catch(()=>{
+				Module['cache'].delete("/_/"+oldname);
+				Module['cache'].delete("/_/"+newname);	//if we're overwriting with a file we don't have then just wipe the old one.
+			});
+		}
 		return 1;
 	},
 	emscriptenfte_buf_delete : function(name)
@@ -626,6 +1085,9 @@ mergeInto(LibraryManager.library,
 			delete FTEH.f[name];
 			f.n = null;
 			_emscriptenfte_buf_release(f.h);
+
+			if (Module['cache'])
+				Module['cache'].delete("/_/"+name);
 			return 1;
 		}
 		return 0;
@@ -654,7 +1116,17 @@ mergeInto(LibraryManager.library,
 		var len = b.l;
 		try
 		{
-			if (localStorage)
+			if (b.n.endsWith(".pak") || b.n.endsWith(".pk3") || b.n.endsWith(".kpf") || b.n.indexOf("/dlcache/")>0)
+			{
+				if (Module['cache'])
+				{
+					console.log("Saving "+b.n+" to cache ("+len+" bytes).");
+					Module['cache'].put("/_/"+b.n, new Response(data, {"headers":{"Content-Type":"application/octet-stream", "Content-Length":len}}));
+				}
+				else
+					console.log("cache not available");
+			}
+			else if (localStorage)
 			{
 				var foo = "";
 				//use a divide and conquer implementation instead for speed?
@@ -667,8 +1139,7 @@ mergeInto(LibraryManager.library,
 		}
 		catch (e)
 		{
-			console.log('exception while trying to save ' + b.n);
-			console.log(e);
+			console.log('exception while trying to save ' + b.n, e);
 		}
 	},
 	emscriptenfte_buf_release : function(handle)
@@ -770,7 +1241,7 @@ mergeInto(LibraryManager.library,
 			s.pc.close();
 			s.pc = null;	//make sure to avoid circular references
 		}
-		
+
 		if (s.broker != null)
 		{
 			s.broker.close();
@@ -831,9 +1302,9 @@ mergeInto(LibraryManager.library,
 		var s = {pc:null, ws:null, inq:[], err:0, con:0, isclient:clientside, callcb:
 			function(evtype,stringdata)
 			{	//private helper
-			
+
 //console.log("emscriptenfte_rtc_create callback: " + evtype);
-			
+
 				var stringlen = (stringdata.length*3)+1;
 				var dataptr = _malloc(stringlen);
 				stringToUTF8(stringdata, dataptr, stringlen);
@@ -872,7 +1343,7 @@ mergeInto(LibraryManager.library,
 				assert(typeof event.data !== 'string' && event.data.byteLength);
 				s.inq.push(new Uint8Array(event.data));
 			};
-			
+
 		s.pc.onicecandidate = function(e)
 			{
 				var desc;
@@ -985,7 +1456,7 @@ mergeInto(LibraryManager.library,
 						console.log(err);
 					});
 		} catch(err) { console.log(err); }
-		
+
 	},
 	emscriptenfte_rtc_candidate : function(sockid, offer)
 	{
@@ -1070,7 +1541,7 @@ mergeInto(LibraryManager.library,
 		//match emscripten's openal support.
 		if (!buf)
 			return;
-	
+
 		var albuf = AL.buffers[buf];
 		AL.buffers[buf] = null; //alIsBuffer will report it as invalid now
 
@@ -1106,6 +1577,50 @@ mergeInto(LibraryManager.library,
 			ctx.buffers[buf] = albuf;
 		}
 	},
+	emscriptenfte_pcm_loadaudiofile : function(ctx, callback, dataptr, datasize, snd_speed)
+	{
+		const successcb = function(buffer)
+		{
+			const frames = buffer.length;
+			const chans = buffer.numberOfChannels;
+			const rate = buffer.sampleRate;
+			const outptr = _malloc(2*frames*chans);
+			if (!outptr)
+				return; //it went away?
+			const dst = HEAP16.subarray(outptr>>1, (outptr+2*frames*chans)>>1);
+
+			/*if (buffer.numberOfChannels == 1)
+				dst.set(buffer.getChannelData(0));
+			else*/ for (let c = 0; c < buffer.numberOfChannels; c++)
+			{
+				const src = buffer.getChannelData(c);
+				for (let f = 0; f < frames; f++)
+					dst[f*chans+c] = 16384*src[f];	//docs imply it should be 32767 but I'm getting unhealthy clipping
+			}
+			{{{makeDynCall('viiif','callback')}}}(ctx, outptr, frames, chans, rate);
+			_free(outptr);
+		};
+		const failurecb = function(buffer)
+		{
+			{{{makeDynCall('viiif','callback')}}}(ctx, 0, 0, 0, 0);
+		};
+
+		try{
+
+			const abuf = new ArrayBuffer(datasize);
+			const rbuf = new Uint8Array(abuf);
+			rbuf.set(HEAPU8.subarray(dataptr, dataptr+datasize));
+			const ac = new AudioContext({sampleRate:snd_speed});
+			ac.decodeAudioData(abuf, successcb, failurecb);	//do the decode
+		
+			return true;
+		}
+		catch(e)
+		{
+			console.log("emscriptenfte_pcm_loadaudiofile failure :(");
+		}
+		return false;
+	},
 
 	emscriptenfte_gl_loadtexturefile : function(texid, widthptr, heightptr, dataptr, datasize, fname, dopremul, genmips)
 	{
@@ -1159,7 +1674,7 @@ mergeInto(LibraryManager.library,
 			GLctx.bindTexture(GLctx.TEXTURE_2D, oldtex);
 		};
 		img.crossorigin = true;
-		img.src = "data:image/png;base64," + encode64(HEAPU8.subarray(dataptr, dataptr+datasize));
+		img.src = "data:image/png;base64," + encode64(HEAPU8.subarray(dataptr, dataptr+datasize));	//png... jpeg... browsers don't seem to actually care
 	},
 
 	Sys_Clipboard_PasteText: function(cbt, callback, ctx)
@@ -1190,7 +1705,7 @@ mergeInto(LibraryManager.library,
 		catch(e)
 		{	//clipboard API not supported at all.
 			console.log(e);	//happens in firefox. lets print it so we know WHY its failing.
-			docallback(FTEC.clipboard);	
+			docallback(FTEC.clipboard);
 		}
 	},
 	Sys_SaveClipboard: function(cbt, text)
diff --git a/engine/web/fteshell.html b/engine/web/fteshell.html
index 7b6ee4fb1..0c5e77558 100644
--- a/engine/web/fteshell.html
+++ b/engine/web/fteshell.html
@@ -3,8 +3,9 @@
   <head>
 	<meta charset="utf-8">
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<link rel="manifest" href="fte_pwa.json" />
 	<meta name=viewport content="width=device-width, initial-scale=1">
-	<title>FTE QuakeWorld</title>
+	<title>FTE Engine</title>
 	<style>
 	html,body { background-color:#000000; color:#808080; height:100%;width:100%;margin:0;padding:0;}
 	.emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
@@ -16,17 +17,33 @@
   <body ondrop="gotdrop(event);" ondragover="event.preventDefault()">
 	<div class="emscripten" id="status">Please allow/unblock our javascript to play.</div>
 	<div id="dropzone" ondrop="gotdrop(event);" ondragover="event.preventDefault()" hidden=1>Drop Zone</div>
+	<button type="button" onclick="addfile()" id="addfile" hidden=1>Add File(s)</button>
 	<button type="button" onclick="begin()" id="begin" hidden=1>Click To Begin!</button>
 	<div class="emscripten">
 		<progress value="0" max="100" id="progress" hidden=1></progress>  
 	</div>
 	<canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()" hidden=1></canvas>
 	<script type='text/javascript'>
+
+//set up a service worker, so that we can actually be installed if so, instead of living in the more general browser cache. Yay for running an online game offline...
+if ("serviceWorker" in navigator)
+    navigator.serviceWorker.register("fte_pwa_sw.js", { scope: "./" }).catch((error) => {console.error(`Service worker registration failed: ${error}`);});
+
+function str2ab(str)
+{   //helper function. Not utf-8, so stick to ascii chars
+    var buf = new ArrayBuffer(str.length);
+    var bufView = new Uint8Array(buf);
+    for (var i=0, strLen=str.length; i < strLen; i++)
+        bufView[i] = str.charCodeAt(i);
+    return buf;
+}
+
 // connect to canvas
 var Module = {
 	files:
 	{	//these can be arraybuffers(you'll need a helper to define those) or promises(fte will block till they complete), or strings (which will be interpretted as urls and downloaded before any C code is run)
 		//note that the code below will skip the file-drop prompt if there's any files specified here (or there's a #foo.fmf file specified)
+		//string values are deemed to be URLs, so use the str2ab("") helper if you want to embed raw file data instead. 
 //		"default.fmf": "default.fmf",
 //		"id1/pak0.pak": "pak0.pak",
 	},
@@ -38,6 +55,7 @@ var Module = {
 	{	//stderr...
 		console.log(text);
 	},
+//	arguments:["wss://theservertojoin", "-manifest", "default.fmf"], //beware the scheme registration stuff (pwa+js methods).
 	canvas: document.getElementById('canvas'),	//for webgl to attach to
 	setStatus: function(text)
 	{	//gets spammed some prints during startup. blame emscripten.
@@ -85,6 +103,7 @@ function begin()
 		return;
 	Module.began = true;
 	document.getElementById('dropzone').hidden = true;
+	document.getElementById('addfile').hidden = true;
 	document.getElementById('begin').hidden = true;
 	Module.setStatus('Downloading...');
 
@@ -180,6 +199,8 @@ function gotdrop(ev)
 		}
 	showfiles();
 }
+if (window.showOpenFilePicker)
+	addfile.hidden = false;
 if (window.location.hash != "" || Object.keys(Module.files).length)
 	begin();		//if the url has a #foo.fmf then just begin instantly, 
 else
diff --git a/engine/web/gl_vidweb.c b/engine/web/gl_vidweb.c
index b37851008..8257d65ec 100644
--- a/engine/web/gl_vidweb.c
+++ b/engine/web/gl_vidweb.c
@@ -1,6 +1,7 @@
 #include "quakedef.h"
 #include "glquake.h"
-#include "web/ftejslib.h"
+#include "vr.h"
+#include "shader.h"
 vfsfile_t *FSWEB_OpenTempHandle(int f);
 
 extern cvar_t gl_lateswap;
@@ -15,13 +16,183 @@ static int gamepaddeviceids[] = {DEVID_UNSET,DEVID_UNSET,DEVID_UNSET,DEVID_UNSET
 static int keyboardid[] = {0};
 static int mouseid[] = {0};
 
-static void *GLVID_getsdlglfunction(char *functionname)
+static cvar_t *xr_enable;	//refrains from starting up when 0 and closes it too, and forces it off too
+static cvar_t *xr_metresize;
+static cvar_t *xr_skipregularview;
+
+static void WebXR_Toggle_f(void)
+{
+	emscriptenfte_xr_setup(-3);	//toggle it.
+}
+static void WebXR_Start_f(void)
+{
+	emscriptenfte_xr_setup(-2);	//start it (any mode)
+}
+static void WebXR_End_f(void)
+{
+	emscriptenfte_xr_setup(-1);	//end it (if running)
+}
+static void WebXR_Start_Inline_f(void)
+{
+	emscriptenfte_xr_setup(-1);	//end it (if running)
+	emscriptenfte_xr_setup(0);	//start it (inline mode)
+}
+static void WebXR_Start_VR_f(void)
+{
+	emscriptenfte_xr_setup(-1);	//end it (if running)
+	emscriptenfte_xr_setup(1);	//start it (inline mode)
+}
+static void WebXR_Start_AR_f(void)
+{
+	emscriptenfte_xr_setup(-1);	//end it (if running)
+	emscriptenfte_xr_setup(2);	//start it (inline mode)
+}
+static void WebXR_Info_f(void)
+{
+	int modes = emscriptenfte_xr_issupported();
+	if (modes == 0)
+	{
+		Con_Printf(S_COLOR_RED"WebXR is unavailable\n");
+		return;
+	}
+	if (modes < 0)
+		Con_Printf("WebXR availability is unknown\n");
+	else
+	{
+		Con_Printf("WebXR-inline is %savailable\n",			(modes & (1<<0))?S_COLOR_GREEN:S_COLOR_RED"un");
+		Con_Printf("WebXR-immersive-vr is %savailable\n",	(modes & (1<<1))?S_COLOR_GREEN:S_COLOR_RED"un");
+		Con_Printf("WebXR-immersive-ar is %savailable\n",	(modes & (1<<2))?S_COLOR_GREEN:S_COLOR_RED"un");
+
+		if (emscriptenfte_xr_isactive())
+			Con_Printf("WebXR is active\n");
+		else
+			Con_Printf("WebXR is inactive\n");
+	}
+}
+
+static qboolean	WebXR_Prepare	(vrsetup_t *setupinfo)
+{	//called before graphics context init. basically just checks if we can do vr.
+	xr_enable			= Cvar_Get2("xr_enable",			"1",			CVAR_SEMICHEAT,	"Controls whether to use webxr rendering or not.",			"WebXR configuration");
+	xr_metresize		= Cvar_Get2("xr_metresize",			"26.24671916",	CVAR_ARCHIVE,	"Size of a metre in game units",							"WebXR configuration");
+	xr_skipregularview	= Cvar_Get2("xr_skipregularview",	"1",			CVAR_ARCHIVE,	"Skip rendering the regular view when OpenXR is active",	"WebXR configuration");
+
+	return xr_enable->ival;//emscriptenfte_xr_issupported() != 0;
+}
+static qboolean	WebXR_Init		(vrsetup_t *setupinfo, rendererstate_t *info)
+{	//called after graphics context init.
+	Cmd_AddCommand("xr_toggle", WebXR_Toggle_f);
+	Cmd_AddCommand("xr_start",	WebXR_Start_f);
+	Cmd_AddCommand("xr_end",	WebXR_End_f);
+	Cmd_AddCommand("xr_start_inline", WebXR_Start_Inline_f);
+	Cmd_AddCommand("xr_start_vr", WebXR_Start_VR_f);
+	Cmd_AddCommand("xr_start_ar", WebXR_Start_AR_f);
+	Cmd_AddCommand("xr_info", WebXR_Info_f);
+	return true;	//we don't have much control here, so we have no failure paths here. probably the session isn't even created.
+}
+static unsigned int	WebXR_SyncFrame	(double *frametime)
+{	//called in the client's main loop, to block/tweak frame times. True means the game should render as fast as possible.
+	return emscriptenfte_xr_isactive();	//we're using openxr's session's sync stuff when this is active.
+}
+static void WebXR_MatrixToQuake(const float in[16], float out[12])
+{
+	float tempmat[16], tempmat2[16];
+	const float fixupmat[16]	= { 0, 0, -1, 0,   -1,  0,  0,  0,    0,  1,  0,  0,    0,  0,  0,  1};
+	const float reorient[16]	= { 0, -1, 0, 0,    0,  0,  1,  0,   -1,  0,  0,  0,    0,  0,  0,  1};
+
+	Matrix4_Multiply(in, fixupmat, tempmat2);//we want z-up...
+	Matrix4_Multiply(reorient, tempmat2, tempmat);//rotate it.
+
+	//transpose it cos smaller? urgh.
+	out[ 0] = tempmat[0];
+	out[ 1] = tempmat[4];
+	out[ 2] = tempmat[8];
+	out[ 3] = tempmat[12];
+	out[ 4] = tempmat[1];
+	out[ 5] = tempmat[5];
+	out[ 6] = tempmat[9];
+	out[ 7] = tempmat[13];
+	out[ 8] = tempmat[2];
+	out[ 9] = tempmat[6];
+	out[10] = tempmat[10];
+	out[11] = tempmat[14];
+
+	//fix up offset scaling parts
+	out[3] *= xr_metresize->value;
+	out[7] *= xr_metresize->value;
+	out[11]*= xr_metresize->value;
+}
+static qboolean	WebXR_Render	(void(*rendereye)(texid_t tex, const pxrect_t *viewport, const vec4_t fovoverride, const float projmatrix[16], const float eyematrix[12]))
+{	//calls rendereye for each view we're meant to be drawing.
+	//webxr uses separate viewpoints on the same fbo
+	struct webxrinfo_s eye[16];
+	fbostate_t fbo;
+	int oldfbo = 0;
+	float eyematrix[12];
+	pxrect_t vp;
+
+	int e, eyes = emscriptenfte_xr_geteyeinfo(countof(eye), eye);
+	if (!eyes)
+		return false;	//erk? lets just do normal drawing.
+
+	for (e = 0; e < eyes; e++)
+	{
+		fbo.fbo = eye[e].fbo;
+		if (!e)
+			oldfbo = GLBE_FBO_Push(&fbo);
+		else
+			GLBE_FBO_Push(&fbo);
+
+		if (!eye[e].viewport[2] || !eye[e].viewport[3])
+			continue;	//no pixels getting drawn... don't waste time (emulators that feel an urge to give a dodgy eye to report two eyes instead of one)
+
+		vp.x		= eye[e].viewport[0];
+		vp.width	= eye[e].viewport[2];
+		vp.height	= eye[e].viewport[3];
+		vp.maxheight = vp.y+vp.height;	//negatives suck.
+		vp.y = vp.maxheight-eye[e].viewport[1]-vp.height;	//opengl sucks
+
+		WebXR_MatrixToQuake(eye[e].transform, eyematrix);
+
+		//really just a pointer to R_RenderEyeScene...
+		rendereye(NULL, &vp, NULL, eye[e].projmatrix, eyematrix);
+	}
+	GLBE_FBO_Pop(oldfbo);
+
+	if (!xr_enable->ival)
+		emscriptenfte_xr_shutdown();
+
+	if (eye[e].fbo==0)
+		return true;	//always skip the non-vr screen when we're fighting over the same FB.
+	return xr_skipregularview->ival;	//skip non-vr rendering.
+}
+static void		WebXR_Shutdown	(void)
+{
+	Cmd_RemoveCommand("xr_toggle");
+	Cmd_RemoveCommand("xr_start");
+	Cmd_RemoveCommand("xr_end");
+	Cmd_RemoveCommand("xr_start_inline");
+	Cmd_RemoveCommand("xr_start_vr");
+	Cmd_RemoveCommand("xr_start_ar");
+	Cmd_RemoveCommand("xr_info");
+	emscriptenfte_xr_shutdown();
+}
+static struct plugvrfuncs_s webxrfuncs = {
+	"WebXR",
+	WebXR_Prepare,
+	WebXR_Init,
+	WebXR_SyncFrame,
+	WebXR_Render,
+	WebXR_Shutdown,
+};
+
+static void *GLVID_getwebglfunction(char *functionname)
 {
 	return NULL;
 }
 
-static void IN_GamePadButtonEvent(unsigned int joydevid, int button, int ispressed, int isstandardmapping)
+static void IN_GamePadButtonEvent(int joydevid, int button, int ispressed, int isstandardmapping)
 {
+	//note that the gamepad API handles 'buttons' as float values, so triggers are here instead of as 'axis' values (unlike other APIs). on the plus side, we're no longer responsible for figuring out the required threshold value to denote a 'press', but we're not tracking half-presses and that's our fault and we don't care.
 	static const int standardmapping[] =
 	{	//the order of these keys is different from that of xinput
 		//however, the quake button codes should be the same. I really ought to define some K_ aliases for them.
@@ -45,6 +216,37 @@ static void IN_GamePadButtonEvent(unsigned int joydevid, int button, int ispress
 		//K_GP_UNKNOWN
 	};
 
+	if (joydevid < 0)
+	{
+		static const int standardxrmapping[] =
+		{
+			//Right					Left
+			K_GP_RIGHT_TRIGGER,		K_GP_LEFT_TRIGGER,	//Primary trigger/button
+			K_GP_RIGHT_SHOULDER,	K_GP_LEFT_SHOULDER,	//Primary squeeze
+			K_GP_TOUCHPAD,			K_GP_MISC1,			//Primary touchpad
+			K_GP_RIGHT_STICK,		K_GP_LEFT_STICK,	//Primary thumbstick
+
+			//'Additional inputs may be exposed after', which should be in some pseudo-prioritised order with the awkward ones last.
+			K_GP_A,					K_GP_DPAD_DOWN,
+			K_GP_B,					K_GP_DPAD_RIGHT,
+			K_GP_X,					K_GP_DPAD_LEFT,
+			K_GP_Y,					K_GP_DPAD_UP,
+		};
+		button = button*2 + (joydevid != -1);	//munge them into a single array cos I cba with all the extra conditionals
+		if (button < countof(standardxrmapping))
+			button = standardxrmapping[button];
+		else
+			return; //err...
+
+		joydevid = countof(gamepaddeviceids)-1;
+	}
+	else if (isstandardmapping && button < countof(standardmapping))
+		button = standardmapping[button];
+	else if (button < 32+4)
+		button = K_JOY1+button;
+	else
+		return;	//err...
+
 	if (joydevid < countof(gamepaddeviceids))
 	{
 		if (joydevid == gamepaddeviceids[joydevid])
@@ -56,36 +258,82 @@ static void IN_GamePadButtonEvent(unsigned int joydevid, int button, int ispress
 		joydevid = gamepaddeviceids[joydevid];
 	}
 
-	if (isstandardmapping)
-	{
-		if (button < countof(standardmapping))
-			IN_KeyEvent(joydevid, ispressed, standardmapping[button], 0);
-	}
-	else
-	{
-		if (button < 32+4)
-			IN_KeyEvent(joydevid, ispressed, K_JOY1+button, 0);
-	}
+	IN_KeyEvent(joydevid, ispressed, button, 0);
 }
 
-static void IN_GamePadAxisEvent(unsigned int joydevid, int axis, float value, int isstandardmapping)
+static void IN_GamePadAxisEvent(int joydevid, int axis, float value, int isstandardmapping)
 {
+	static const int standardmapping[] = {GPAXIS_LT_RIGHT,GPAXIS_LT_DOWN,GPAXIS_RT_RIGHT,GPAXIS_RT_DOWN};
+	if (joydevid < 0)
+	{
+		static const int standardxrmapping[] =
+		{
+			//Right					Left
+			-1,						-1,					//Primary touchpad X
+			-1,						-1,					//Primary touchpad Y
+			GPAXIS_RT_RIGHT,		GPAXIS_LT_RIGHT,	//Primary thumbstick X
+			GPAXIS_RT_DOWN,			GPAXIS_LT_DOWN,		//Primary thumbstick Y
+
+			//'Additional inputs may be exposed after', which should be in some pseudo-prioritised order with the awkward ones last.
+		};
+		axis = axis*2 + (joydevid != -1);	//munge them into a single array cos I cba with all the extra conditionals
+		if (axis < countof(standardxrmapping))
+			axis = standardxrmapping[axis];
+		else
+			return; //err...
+
+		joydevid = countof(gamepaddeviceids)-1;
+	}
+	else if (isstandardmapping)
+	{
+		if (axis < countof(standardmapping))
+			axis = standardmapping[axis];
+	}
+	else
+		return;	//random mappings? erk?
+
 	if (joydevid < countof(gamepaddeviceids))
 	{
 		joydevid = gamepaddeviceids[joydevid];
 		if (joydevid == DEVID_UNSET)
 			return;	//don't send axis events until its enabled.
 	}
-	if (isstandardmapping)
-	{
-		int axismap[] = {GPAXIS_LT_RIGHT,GPAXIS_LT_DOWN,GPAXIS_RT_RIGHT,GPAXIS_RT_DOWN};
-		if (axis < countof(axismap))
-			IN_JoystickAxisEvent(joydevid, axismap[axis], value);
-	}
 	else
 		IN_JoystickAxisEvent(joydevid, axis, value);
 }
 
+static void IN_GamePadOrientationEvent(int joydevid, float px,float py,float pz, float qx,float qy,float qz,float qw)
+{	//(some) vr controllers only
+	vec3_t org, ang;
+	const char *dev;
+
+	const float sqw = qw * qw;
+	const float sqx = qx * qx;
+	const float sqy = qy * qy;
+	const float sqz = qz * qz;
+
+	ang[PITCH] = -asin(-2 * (qy * qz - qw * qx)) * (180/M_PI);
+	ang[YAW] = atan2(2 * (qx * qz + qw * qy), sqw - sqx - sqy + sqz) * (180/M_PI);
+	ang[ROLL] = -atan2(2 * (qx * qy + qw * qz), sqw - sqx + sqy - sqz) * (180/M_PI);
+
+	org[0] = -pz * xr_metresize->value;
+	org[1] = -px * xr_metresize->value;
+	org[2] = py * xr_metresize->value;
+
+	if (joydevid == -1)
+		dev = "right";
+	else if (joydevid == -2)
+		dev = "left";
+	else if (joydevid == -3)
+		dev = "head";
+	else if (joydevid == -4)
+		dev = "gaze";
+	else
+		return;
+
+	IN_SetHandPosition(dev, org, ang, NULL, NULL);
+}
+
 static void VID_Resized(int width, int height)
 {
 	extern cvar_t vid_conautoscale, vid_conwidth;
@@ -128,41 +376,6 @@ static unsigned int domkeytoquake(unsigned int code)
 	if (!tab[code])
 		Con_DPrintf("You just pressed key %u, but I don't know what its meant to be\n", code);
 
-//	Con_DPrintf("You just pressed dom key %u, which is quake key %u\n", code, tab[code]);
-	return tab[code];
-}
-static unsigned int domkeytoshift(unsigned int code)
-{
-	static const unsigned short tab[256] =
-	{
-		/*  0*/ 0,0,0,0,0,0,0,0,                K_BACKSPACE,K_TAB,0,0,0,K_ENTER,0,0,
-		/* 16*/ K_SHIFT,K_CTRL,K_ALT,K_PAUSE,K_CAPSLOCK,0,0,0,0,0,0,K_ESCAPE,0,0,0,0,
-		/* 32*/ ' ',K_PGUP,K_PGDN,K_END,K_HOME,K_LEFTARROW,K_UPARROW,K_RIGHTARROW,              K_DOWNARROW,0,0,0,K_PRINTSCREEN,K_INS,K_DEL,0,
-		/* 48*/ ')','!','\"',0xA3/*poundsign*/,'$','%','^','&',                '*','(',0,':',0,'+',0,0,
-
-		/* 64*/ 0,'A','B','C','D','E','F','G',          'H','I','J','K','L','M','N','O',
-		/* 80*/ 'P','Q','R','S','T','U','V','W',                'X','Y','Z',K_LWIN,K_RWIN,K_APP,0,0,
-		/* 96*/ K_KP_INS,K_KP_END,K_KP_DOWNARROW,K_KP_PGDN,K_KP_LEFTARROW,K_KP_5,K_KP_RIGHTARROW,K_KP_HOME,             K_KP_UPARROW,K_KP_PGDN,K_KP_STAR,K_KP_PLUS,0,K_KP_MINUS,K_KP_DEL,K_KP_SLASH,
-		/*112*/ K_F1,K_F2,K_F3,K_F4,K_F5,K_F6,K_F7,K_F8,K_F9,K_F10,K_F11,K_F12,0,0,0,0,
-		/*128*/ 0,0,0,0,0,0,0,0,                0,0,0,0,0,0,0,0,
-		/*144*/ K_KP_NUMLOCK,K_SCRLCK,0,0,0,0,0,0,              0,0,0,0,0,0,0,0,
-		/*160*/ 0,0,0,'~',0,0,0,0,                0,0,0,0,0,'_',0,0,
-		/*176*/ 0,0,0,0,0,0,0,0,                0,0,':','+','<','_','>','?',
-		/*192*/ '`',0,0,0,0,0,0,0,             0,0,0,0,0,0,0,0,
-		/*208*/ 0,0,0,0,0,0,0,0,                0,0,0,'{','|','}','@','`',
-		/*224*/ 0,0,0,0,0,0,0,0,                0,0,0,0,0,0,0,0,
-		/*240*/ 0,0,0,0,0,0,0,0,                0,0,0,0,0,0,0,0,
-	};
-	if (!code)
-		return 0;
-	if (code >= sizeof(tab)/sizeof(tab[0]))
-	{
-		Con_DPrintf("You just pressed key %u, but I don't know what its meant to be\n", code);
-		return 0;
-	}
-	if (!tab[code])
-		Con_DPrintf("You just pressed key %u, but I don't know what its meant to be\n", code);
-
 //	Con_DPrintf("You just pressed dom key %u, which is quake key %u\n", code, tab[code]);
 	return tab[code];
 }
@@ -172,14 +385,11 @@ static int DOM_KeyEvent(unsigned int devid, int down, int scan, int uni)
 //	Con_Printf("Key %s %i %i:%c\n", down?"down":"up", scan, uni, uni?(char)uni:' ');
 	if (shift_down)
 	{
-//		uni = domkeytoshift(scan);
 		scan = domkeytoquake(scan);
-//		uni = (uni >= 32 && uni <= 127)?uni:0;
 	}
 	else
 	{
 		scan = domkeytoquake(scan);
-//		uni = (scan >= 32 && scan <= 127)?scan:0;
 	}
 	IN_KeyEvent(keyboardid[devid], down, scan, uni);
 	//Chars which don't map to some printable ascii value get preventDefaulted.
@@ -223,11 +433,13 @@ static void DOM_ButtonEvent(unsigned int devid, int down, int button)
 		while(button < 0)
 		{
 			IN_KeyEvent(mouseid[devid], true, K_MWHEELUP, 0);
+			IN_KeyEvent(mouseid[devid], false, K_MWHEELUP, 0);
 			button += 1;
 		}
 		while(button > 0)
 		{
 			IN_KeyEvent(mouseid[devid], true, K_MWHEELDOWN, 0);
+			IN_KeyEvent(mouseid[devid], false, K_MWHEELUP, 0);
 			button -= 1;
 		}
 	}
@@ -311,6 +523,7 @@ qboolean GLVID_Init (rendererstate_t *info, unsigned char *palette)
 		DOM_CbufAddText,
 		IN_GamePadButtonEvent,
 		IN_GamePadAxisEvent,
+		IN_GamePadOrientationEvent,
 		VID_ShouldSwitchToFullscreen
 		))
 	{
@@ -320,8 +533,14 @@ qboolean GLVID_Init (rendererstate_t *info, unsigned char *palette)
 
 	vid.activeapp = true;
 
-	if (!GL_Init(info, GLVID_getsdlglfunction))
+	if (info->vr && !info->vr->Prepare(NULL))
+		info->vr = NULL;	//not available.
+
+	if (!GL_Init(info, GLVID_getwebglfunction))
+		return false;		
+	if (info->vr && !info->vr->Init(NULL, info))
 		return false;
+	vid.vr = info->vr;
 
 	qglViewport (0, 0, vid.pixelwidth, vid.pixelheight);
 
@@ -336,7 +555,7 @@ void GLVID_DeInit (void)
 {
 	vid.activeapp = false;
 
-	emscriptenfte_setupcanvas(-1, -1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+	emscriptenfte_setupcanvas(-1, -1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 	GL_ForgetPointers();
 }
@@ -400,6 +619,8 @@ void INS_Move(void)
 }
 void INS_Init (void)
 {
+	//mneh, handy enough
+	R_RegisterVRDriver(NULL, &webxrfuncs);
 }
 void INS_Accumulate(void)
 {
diff --git a/engine/web/prejs.js b/engine/web/prejs.js
index 294cf323a..5091052fd 100644
--- a/engine/web/prejs.js
+++ b/engine/web/prejs.js
@@ -1,9 +1,7 @@
 //Populate our filesystem from Module['files']
 FTEH = {h: [],
 		f: {}};
-
-if (!Module["arguments"])
-	Module['arguments'] = ['-nohome'];
+FTE_SW=null;
 
 if (!Module['canvas'])
 {	//we need a canvas to throw our webgl crap at...
@@ -18,10 +16,41 @@ if (!Module['canvas'])
 	}
 }
 
+Module['loadcachedfiles'] = function()
+{	//recover any previously saved files they might have drag+dropped.
+	addRunDependency("loadcachedfiles");
+	try
+	{
+		caches.open('user').then((c)=>{Module['cache']=c;return c.keys();}).then((keys)=>{
+			const cache = Module['cache'];
+			for(var r of keys)
+			{
+				const idx = r.url.indexOf("/_/")
+				if (idx < 0)
+					continue;	//wtf? that entry should not have been in this cache object.
+				const fn = r.url.substr(idx+3);
+				addRunDependency(fn);
+				const response = cache.match(r).then((response)=>{return response.arrayBuffer();}).then((buffer)=>{
+					let b = FTEH.h[_emscriptenfte_buf_createfromarraybuf(buffer)];
+					b.n = fn;
+					FTEH.f[b.n] = b;
+				}).finally(()=>{removeRunDependency(fn);});
+			}
+		}).finally(()=>{removeRunDependency("loadcachedfiles");});
+	}
+	catch(e)
+	{
+		removeRunDependency("loadcachedfiles");
+	}
+};
+
+Module['preRun'] = Module['loadcachedfiles'];
 if (typeof Module['files'] !== "undefined" && Object.keys(Module['files']).length>0)
 {
 	Module['preRun'] = function()
 	{
+		Module['loadcachedfiles']();
+
 		let files = Module['files'];
 		let names = Object.keys(files);
 		for (let i = 0; i < names.length; i++)
@@ -94,22 +123,35 @@ else if (typeof man == "undefined")
 		man += "index.fmf";
 }
 
-if (window.location.hash != "")
-	man = window.location.hash.substring(1);
-
-if (typeof man != "undefined")
-	Module['arguments'] = Module['arguments'].concat(['-manifest', man]);
-
-// use query string in URL as command line
-qstring = decodeURIComponent(window.location.search.substring(1)).split(" ");
-for (let i = 0; i < qstring.length; i++)
+if (!Module['arguments'])	//the html can be explicit about its args if it sets this to an empty array or w/e
 {
-	if ((qstring[i] == '+sv_port_rtc' || qstring[i] == '+connect' || qstring[i] == '+join' || qstring[i] == '+observe' || qstring[i] == '+qtvplay') && i+1 < qstring.length)
-	{
-		Module['arguments'] = Module['arguments'].concat(qstring[i+0], qstring[i+1]);
-		i++;
-	}
-	else if (!document.referrer)
-		Module['arguments'] = Module['arguments'].concat(qstring[i]);
-}
+	Module['arguments'] = [];
 
+	if (window.location.hash != "")
+		man = window.location.hash.substring(1);
+
+	// use query string in URL as command line
+	const qstrings = decodeURIComponent(window.location.search.substring(1));
+	if (qstrings != "")
+	{
+		const qstring = qstrings.split(" ");
+		for (let i = 0; i < qstring.length; i++)
+		{
+			if (qstring[i] == '-manifest')
+				man = undefined; //don't do double manifest args...
+			if ((qstring[i] == '+sv_port_rtc' || qstring[i] == '+connect' || qstring[i] == '+join' || qstring[i] == '+observe' || qstring[i] == '+qtvplay') && i+1 < qstring.length)
+			{
+				Module['arguments'] = Module['arguments'].concat(qstring[i+0], qstring[i+1]);
+				i++;
+			}
+			else if (!document.referrer)	//ignore args from referers in order to try to protect against dodgy srgs a little.
+				Module['arguments'] = Module['arguments'].concat(qstring[i]);
+		}
+	}
+
+	if (typeof man != "undefined")
+		Module['arguments'] = Module['arguments'].concat(['-manifest', man]);
+
+	//registerProtocolHandler needs to be able to pass it through to us... so only allow it if we're parsing args from the url.
+	Module['mayregisterscemes'] = true;
+}
diff --git a/engine/web/sys_web.c b/engine/web/sys_web.c
index 8273214ce..8e5ae19e3 100644
--- a/engine/web/sys_web.c
+++ b/engine/web/sys_web.c
@@ -1,13 +1,5 @@
 #include "quakedef.h"
-
-#ifdef MULTITHREAD
-#include <SDL_thread.h>
-#endif
-
-#include <SDL_loadso.h>
-
 #include <emscripten/emscripten.h>
-#include "ftejslib.h"
 
 #ifndef isDedicated
 qboolean isDedicated;
@@ -45,12 +37,100 @@ qboolean Sys_RandomBytes(qbyte *string, int len)
 	return false;
 }
 
+static qboolean sys_supportsansi;
+static char ansiremap[8] = {'0', '4', '2', '6', '1', '5', '3', '7'};
+static size_t ApplyColour(char *out, size_t outsize, unsigned int chrflags)
+{
+	char *s, *e;
+	static int oldflags = CON_WHITEMASK;
+	int bg, fg;
+
+	if (!sys_supportsansi)
+		return 0;
+	if (oldflags == chrflags)
+		return 0;
+	s = out;
+	e = out+outsize;
+	oldflags = chrflags;
+
+	*out++='\x1b';
+	*out++='[';
+	*out++='0';
+	*out++=';';
+	if (chrflags & CON_BLINKTEXT)
+	{	//set blink flag
+		*out++='5';
+		*out++=';';
+	}
+
+	bg = (chrflags & CON_BGMASK) >> CON_BGSHIFT;
+	fg = (chrflags & CON_FGMASK) >> CON_FGSHIFT;
+
+	// don't handle intensive bit for background
+	// as terminals differ too much in displaying \e[1;7;3?m
+	bg &= 0x7;
+
+	if (chrflags & CON_NONCLEARBG)
+	{
+		if (fg & 0x8) // intensive bit set for foreground
+		{	// set bold/intensity ansi flag
+			*out++='1';
+			*out++=';';
+			fg &= 0x7; // strip intensive bit
+		}
+
+		// set foreground and background colors
+		*out++='3';
+		*out++=ansiremap[fg];
+		*out++=';';
+		*out++='4';
+		*out++=ansiremap[bg];
+		*out++='m';
+	}
+	else
+	{
+		switch(fg)
+		{
+		//to get around wierd defaults (like a white background) we have these special hacks for colours 0 and 7
+		case COLOR_BLACK:
+			// set inverse
+			*out++='7';
+			*out++='m';
+			break;
+		case COLOR_GREY:
+			*out++='1';
+			*out++=';';
+			*out++='3';
+			*out++='0';
+			*out++='m';
+			break;
+		case COLOR_WHITE:
+			// set nothing else
+			*out++='m';
+			break;
+		default:
+			if (fg & 0x8) // intensive bit set for foreground
+			{
+				// set bold/intensity ansi flag
+				*out++='1';
+				*out++=';';
+				fg &= 0x7; // strip intensive bit
+			}
+
+			*out++='3';
+			*out++=ansiremap[fg];
+			*out++='m';
+			break;
+		}
+	}
+	return out-s;
+}
 //print into stdout
 void Sys_Printf (char *fmt, ...)
 {
 	va_list		argptr;	
-	char text[2048];
-	conchar_t	ctext[2048], *e, *c;
+	char text[65536];
+	conchar_t	ctext[countof(text)], *e, *c;
 	unsigned int len = 0;
 	unsigned int w, codeflags;
 		
@@ -68,6 +148,10 @@ void Sys_Printf (char *fmt, ...)
 		if (codeflags & CON_HIDDEN)
 			continue;
 
+		if ((codeflags&CON_RICHFORECOLOUR) || (w == '\n' && (codeflags&CON_NONCLEARBG)))
+			codeflags = CON_WHITEMASK;	//make sure we don't get annoying backgrounds on other lines.
+		len+=ApplyColour(text+len,sizeof(text)-1-len, codeflags);
+
 		//dequake it as required, so its only codepoints the browser will understand. should probably deal with linefeeds specially.
 		if (w >= 0xe000 && w < 0xe100)
 		{	//quake-encoded mess
@@ -89,7 +173,11 @@ void Sys_Printf (char *fmt, ...)
 	
 		len += utf8_encode(text+len, w, sizeof(text)-1-len);
 	}
+
+	len+=ApplyColour(text+len,sizeof(text)-1-len, CON_WHITEMASK);	//force it back to white at the end of the print... just in case
+
 	text[len] = 0;
+	
 
 	//now throw it at the browser's console.log.
 	emscriptenfte_print(text);
@@ -138,7 +226,7 @@ double Sys_DoubleTime (void)
 }
 #endif
 
-//create a directory
+//create a directory. we don't do dirs.
 void Sys_mkdir (const char *path)
 {
 }
@@ -160,6 +248,7 @@ qboolean Sys_Rename (const char *oldfname, const char *newfname)
 }
 qboolean Sys_GetFreeDiskSpace(const char *path, quint64_t *freespace)
 {	//not implemented. we could try querying local storage quotas, but our filesystem is otherwise purely ram so doesn't have much of a limit in 64bit browsers. hurrah for swap space.
+	*freespace = 0;	//just in case.
 	return false;
 }
 
@@ -249,9 +338,29 @@ void Sys_BrowserRedirect_f(void)
 {
 	emscriptenfte_window_location(Cmd_Argv(1));
 }
+void Sys_OpenFile_f(void)
+{
+	emscriptenfte_openfile();
+}
 
+
+static void Sys_Register_File_Associations_f(void)
+{	//we should be able to register 'web+foo://' schemes here. we can't skip the web+ part though, which is a shame.
+	const char *s;
+	char scheme[MAX_OSPATH];
+	const char *schemes = fs_manifest->schemes;
+	for (s = schemes; (s=COM_ParseOut(s,scheme,sizeof(scheme)));)
+	{
+		EM_ASM({
+			navigator.registerProtocolHandler(
+				UTF8ToString($0),
+				document.location.origin+document.location.pathname+"?%s"+document.location.hash,
+				UTF8ToString($1));
+			}, va("%s%s", strncmp(scheme,"web+",4)?"web+":"", scheme), fs_manifest->formalname?fs_manifest->formalname:fs_manifest->installation);
+	}
+}
 char *Sys_URIScheme_NeedsRegistering(void)
-{	//just disables the prompts that we can't honour anyway.
+{	//we have no way to query if we're registered or not. cl_main will default to bypassing this.
 	return NULL;
 }
 
@@ -264,10 +373,18 @@ void Sys_Init(void)
 	vid_width.flags &= ~CVAR_VIDEOLATCH;
 	vid_height.flags &= ~CVAR_VIDEOLATCH;
 
-	Cmd_AddCommand("sys_browserredirect", Sys_BrowserRedirect_f);
+	Cmd_AddCommandD("sys_browserredirect", Sys_BrowserRedirect_f, "Navigates the browser to a different url. For sites using quake maps as a more interesting sitemap.");
+	if (EM_ASM_INT(return window.showOpenFilePicker!=undefined;))	//doesn't work in firefox.
+		Cmd_AddCommandD("sys_openfile", Sys_OpenFile_f, "Opens a file picker");	//opens file picker
+	if (EM_ASM_INT(return Module['mayregisterscemes'] != false;))	//needs to be able to pass args via the url. don't bother adding the command if it'll fail. hurrah for checkcmd
+		Cmd_AddCommandD("sys_register_file_associations", Sys_Register_File_Associations_f, "Register this page as the default handler for web+scheme handlers.\n");
+
+	//can't really do feature detection for this... either we spit out unreadable text or we don't...
+	sys_supportsansi = EM_ASM_INT(return navigator.userAgent.indexOf("FireFox")!=-1;);
 }
 void Sys_Shutdown(void)
 {
+	emscriptenfte_setupmainloop(NULL);
 }
 
 
@@ -308,7 +425,7 @@ int Sys_MainLoop(double newtime)
 	time = newtime - oldtime;
 	if (!host_initialized)
 	{
-		Sys_Printf ("Host_Init\n");
+		Sys_Printf ("Starting "FULLENGINENAME"\n");
 		Host_Init (&parms);
 		return 1;
 	}
@@ -323,7 +440,6 @@ int QDECL main(int argc, char **argv)
 {
 	memset(&parms, 0, sizeof(parms));
 
-
 	parms.basedir = "";
 
 	parms.argc = argc;
@@ -364,6 +480,7 @@ void Sys_SaveClipboard(clipboardtype_t cbt, const char *text)
 }*/
 
 #ifdef MULTITHREAD
+#include <SDL_thread.h>	//FIXME: swap this out for sys_linux_threads.c (our pthreads code)
 /* Thread creation calls */
 void *Sys_CreateThread(char *name, int (*func)(void *), void *args, int priority, int stacksize)
 {
diff --git a/fteqtv/control.c b/fteqtv/control.c
index ea40a9397..8e2824306 100644
--- a/fteqtv/control.c
+++ b/fteqtv/control.c
@@ -208,16 +208,19 @@ void Cluster_Run(cluster_t *cluster, qboolean dowait)
 {
 	oproxy_t *pend, *pend2, *pend3;
 	sv_t *sv, *old;
+	tcpconnect_t *tc;
 
 	int m;
 	struct timeval timeout;
 	fd_set socketset;
+	fd_set socketset_wr;
 
 	if (dowait)
 	{
 		//FIXME: use poll or epoll to work around FD_SETSIZE limits, though we're mostly only doing this for the sleeping.
 
 		FD_ZERO(&socketset);
+		FD_ZERO(&socketset_wr);
 		m = 0;
 		if (cluster->qwdsocket[0] != INVALID_SOCKET)
 		{
@@ -250,6 +253,28 @@ void Cluster_Run(cluster_t *cluster, qboolean dowait)
 			}
 		}
 
+		for (tc = cluster->tcpconnects; tc; tc = tc->next)
+		{
+			if (tc->sock != INVALID_SOCKET && tc->sock < FD_SETSIZE)
+			{
+				FD_SET(tc->sock, &socketset);
+				if (tc->sock >= m)
+					m = tc->sock+1;
+			}
+		}
+
+		for (pend = cluster->pendingproxies; pend; pend = pend->next)
+		{
+			if (pend->sock != INVALID_SOCKET && pend->sock < FD_SETSIZE)
+			{
+				FD_SET(pend->sock, &socketset);
+				if (pend->file)	//also wake up if we're doing some (large) file transfer and we can give them a bit more.
+					FD_SET(pend->sock, &socketset_wr);
+				if (pend->sock >= m)
+					m = pend->sock+1;
+			}
+		}
+
 	#ifndef _WIN32
 		#ifndef STDIN
 			#define STDIN 0
@@ -270,7 +295,7 @@ void Cluster_Run(cluster_t *cluster, qboolean dowait)
 			timeout.tv_usec = (100%1000)*1000;
 		}
 
-		m = select(m, &socketset, NULL, NULL, &timeout);
+		m = select(m, &socketset, &socketset_wr, NULL, &timeout);
 
 #ifdef _WIN32
 		for (;;)
diff --git a/fteqtv/forward.c b/fteqtv/forward.c
index f5e882176..5579b2cae 100644
--- a/fteqtv/forward.c
+++ b/fteqtv/forward.c
@@ -216,7 +216,8 @@ void Net_TryFlushProxyBuffer(cluster_t *cluster, oproxy_t *prox)
 		prox->flushing = false;
 		break;
 	case -1:
-		if (qerrno != NET_EWOULDBLOCK && qerrno != NET_EAGAIN)	//not a problem, so long as we can flush it later.
+		length = qerrno;
+		if (length != NET_EWOULDBLOCK && length != NET_EAGAIN)	//not a problem, so long as we can flush it later.
 		{
 			Sys_Printf(cluster, "network error from client proxy\n");
 			prox->drop = true;	//drop them if we get any errors
@@ -866,6 +867,8 @@ qboolean SV_ReadPendingProxy(cluster_t *cluster, oproxy_t *pend)
 			closesocket(pend->sock);
 		free(pend);
 		cluster->numproxies--;
+
+		//REMEMBER TO PUT ANY CLEANUP INSIDE QW_TCPConnection TOO!
 		return true;
 	}
 #define QTVSVHEADER "QTVSV 1.1\n"
@@ -892,7 +895,7 @@ qboolean SV_ReadPendingProxy(cluster_t *cluster, oproxy_t *pend)
 			if (space > MAX_PROXY_BUFFER - 
 			fread(prox->buffer + pend->buffersize, 1, space, pend->srcfile);
 #else
-			if (pend->bufferpos == pend->buffersize)
+			while (pend->bufferpos == pend->buffersize)
 			{
 				char buffer[MAX_PROXY_BUFFER/2];
 				pend->droptime = cluster->curtime + 5*1000;
@@ -901,8 +904,10 @@ qboolean SV_ReadPendingProxy(cluster_t *cluster, oproxy_t *pend)
 				{
 					fclose(pend->srcfile);
 					pend->srcfile = NULL;
+					break;
 				}
 				Net_ProxySend(cluster, pend, buffer, len);
+				Net_TryFlushProxyBuffer(cluster, pend);
 			}
 #endif
 			return false;	//don't try reading anything yet
@@ -928,6 +933,7 @@ qboolean SV_ReadPendingProxy(cluster_t *cluster, oproxy_t *pend)
 	if (len == 0)
 	{
 		pend->drop = true;
+		printf("pending EOF\n");
 		return false;
 	}
 	else if (len > 0)
@@ -944,34 +950,10 @@ qboolean SV_ReadPendingProxy(cluster_t *cluster, oproxy_t *pend)
 	{
 		if (!strncmp(pend->inbuffer, "qizmo\n", 6))
 		{
-			wsrbuf_t ws = pend->websocket;
-			SOCKET sock;
 			//carries unreliable packets
 			printf("tcpconnect\n");
-			if (pend->srcfile)
-				fclose(pend->srcfile);
-			sock = pend->sock;
-			free(pend);
-			cluster->numproxies--;
-
-			send(sock, "qizmo\n", 6, 0);
-			QW_TCPConnection(cluster, sock, ws);
-
-			return true;
-		}
-		if (pend->websocket.websocket && !strncmp(pend->inbuffer, "\xff\xff\xff\xff", 4))
-		{
-			wsrbuf_t ws = pend->websocket;
-			SOCKET sock;
-			//carries unreliable packets
-			printf("wsconnect\n");
-			if (pend->srcfile)
-				fclose(pend->srcfile);
-			sock = pend->sock;
-			free(pend);
-			cluster->numproxies--;
-
-			QW_TCPConnection(cluster, sock, ws);
+			send(pend->sock, "qizmo\n", 6, 0);
+			QW_TCPConnection(cluster, pend, NULL);
 
 			return true;
 		}
@@ -1016,10 +998,18 @@ qboolean SV_ReadPendingProxy(cluster_t *cluster, oproxy_t *pend)
 	else if (!ustrncmp(pend->inbuffer, "GET ", 4))
 	{
 		pend->drop = true;
-		HTTPSV_GetMethod(cluster, pend);
+		colon = HTTPSV_GetMethod(cluster, pend);
 		pend->flushing = true;
 		memmove(pend->inbuffer, pend->inbuffer+headersize, pend->inbuffersize-headersize);
 		pend->inbuffersize -= headersize;
+
+		if (colon)
+		{
+			//carries unreliable packets
+			printf("wsconnect\n");
+			QW_TCPConnection(cluster, pend, colon);
+			return true;
+		}
 		return SV_ReadPendingProxy(cluster, pend);
 	}
 
diff --git a/fteqtv/httpsv.c b/fteqtv/httpsv.c
index 1c9f02040..75354b66b 100644
--- a/fteqtv/httpsv.c
+++ b/fteqtv/httpsv.c
@@ -1,6 +1,9 @@
 #include "qtv.h"
 
-#define MINPLUGVER "4239"
+#define WEBPORTMANIFEST	"https://triptohell.info/demo.fmf"
+
+//#define WEBPORTMANIFEST	"http://localhost:8080/demo.fmf"
+
 //main reason to use connection close is because we're lazy and don't want to give sizes in advance (yes, we could use chunks..)
 
 size_t SHA1(unsigned char *digest, size_t maxdigestsize, const unsigned char *string, size_t stringlen);
@@ -137,30 +140,53 @@ static void HTMLprintf(char *outb, int outl, char *fmt, ...)
 	*outb++ = 0;
 }
 
-static void HTTPSV_SendHTTPHeader(cluster_t *cluster, oproxy_t *dest, char *error_code, char *content_type, qboolean nocache)
+static void HTTPSV_SendHTTPHeader(cluster_t *cluster, oproxy_t *dest, char *error_code, char *content_type, int csize, qboolean nocache)
 {
 	char *s;
 	char buffer[2048];
 
 	if (nocache)
 	{
-		s =	"HTTP/1.1 %s OK\r\n"
-			"Content-Type: %s\r\n"
-			"Cache-Control: no-cache, must-revalidate\r\n"
-			"Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n"
-			"Connection: close\r\n"
-			"\r\n";
+		if (csize >= 0)
+		{
+			s =	"HTTP/1.1 %s OK\r\n"
+				"Content-Type: %s\r\n"
+				"Content-Length: %i\r\n"
+				"Cache-Control: no-cache, must-revalidate\r\n"
+				"Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n"
+				"\r\n";
+		}
+		else
+		{
+			s =	"HTTP/1.1 %s OK\r\n"
+				"Content-Type: %s\r\n"
+				"Cache-Control: no-cache, must-revalidate\r\n"
+				"Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n"
+				"Connection: close\r\n"
+				"\r\n";
+		}
 	}
 	else
 	{
-		s =	"HTTP/1.1 %s OK\r\n"
-			"Cache-Control: public, max-age=3600\r\n"
-			"Content-Type: %s\r\n"
-			"Connection: close\r\n"
-			"\r\n";
+		if (csize >= 0)
+		{
+			s =	"HTTP/1.1 %s OK\r\n"
+				"Cache-Control: public, max-age=3600\r\n"
+				"Content-Type: %s\r\n"
+				"Content-Length: %i\r\n"
+				"\r\n";
+		}
+		else
+		{
+			s =	"HTTP/1.1 %s OK\r\n"
+				"Cache-Control: public, max-age=3600\r\n"
+				"Content-Type: %s\r\n"
+				"Connection: close\r\n"
+				"\r\n";
+		}
 	}
 
-	snprintf(buffer, sizeof(buffer), s, error_code, content_type);
+	snprintf(buffer, sizeof(buffer), s, error_code, content_type, csize);
 
 	Net_ProxySend(cluster, dest, buffer, strlen(buffer));
 }
@@ -178,7 +204,7 @@ static void HTTPSV_SendHTMLHeader(cluster_t *cluster, oproxy_t *dest, char *titl
 		args++;
 	}
 
-	s =	"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n"
+	s =	"<!DOCTYPE HTML>\n"
 		"<html>\n"
 		"<head>\n"
 		"  <meta http-equiv=\"content-type\" content=\"text/html; charset=iso-8859-1\">\n"
@@ -189,15 +215,15 @@ static void HTTPSV_SendHTMLHeader(cluster_t *cluster, oproxy_t *dest, char *titl
 		"<li><a href=\"/nowplaying.html%s\">Live</a></li>"
 		"<li><a href=\"/demos.html%s\">Demos</a></li>"
 		"%s"
-		"%s"
+		/*"%s"*/
 		"</ul></div>";
 
 	snprintf(buffer, sizeof(buffer), s, title, 
 
 		plugin?"?p":"", 
 		plugin?"?p":"", 
-		(!*cluster->adminpassword)?"":(plugin?"<li><a href=\"/admin.html?p\">Admin</a></li>":"<li><a href=\"/admin.html\">Admin</a></li>"),
-		plugin?"<li><a target=\"_top\" href=\"/nowplaying.html\">Basic</a></li>":"<li><a href=\"/plugin.html\">Plugin</a></li>"
+		(!*cluster->adminpassword)?"":(plugin?"<li><a href=\"/admin.html?p\">Admin</a></li>":"<li><a href=\"/admin.html\">Admin</a></li>")/*,
+		plugin?"<li><a target=\"_top\" href=\"/nowplaying.html\">Basic</a></li>":"<li><a href=\"/plugin.html\">Plugin</a></li>"*/
 		
 		);
 
@@ -220,6 +246,7 @@ static void HTTPSV_SendHTMLFooter(cluster_t *cluster, oproxy_t *dest)
 }
 
 #define HTMLPRINT(str) Net_ProxySend(cluster, dest, str "\n", strlen(str "\n"))
+#define HTTPPRINT(str) Net_ProxySend(cluster, dest, str, strlen(str))
 
 static void HTTPSV_GenerateNowPlaying(cluster_t *cluster, oproxy_t *dest, char *args)
 {
@@ -231,7 +258,7 @@ static void HTTPSV_GenerateNowPlaying(cluster_t *cluster, oproxy_t *dest, char *
 	qboolean plugin = false;
 	qboolean activeonly = false;
 
-	HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/html", true);
+	HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/html", -1, true);
 	HTTPSV_SendHTMLHeader(cluster, dest, "QuakeTV: Now Playing", args);
 
 	while (*args && *args != ' ')
@@ -269,10 +296,15 @@ static void HTTPSV_GenerateNowPlaying(cluster_t *cluster, oproxy_t *dest, char *
 		HTMLPRINT("<dt>");
 		HTMLprintf(buffer, sizeof(buffer), "%s (%s: %s)", streams->server, streams->map.gamedir, streams->map.mapname);
 		Net_ProxySend(cluster, dest, buffer, strlen(buffer));
+		if (plugin && !strncmp(streams->server, "tcp:", 4))
+		{
+			snprintf(buffer, sizeof(buffer), "<span class=\"qtvfile\"> [ <a onclick=\"parent.joinstream('%s')\">Join</a> ]</span>", streams->server);
+			Net_ProxySend(cluster, dest, buffer, strlen(buffer));
+		}
 		if (plugin && !strncmp(streams->server, "udp:", 4))
 			snprintf(buffer, sizeof(buffer), "<span class=\"qtvfile\"> [ <a href=\"javascript:parent.joinserver('%s')\">Join</a> ]</span>", streams->server+4);
 		else
-			snprintf(buffer, sizeof(buffer), "<span class=\"qtvfile\"> [ <a href=\"/watch.qtv?sid=%i\">Watch Now</a> ]</span>", streams->streamid);
+			snprintf(buffer, sizeof(buffer), "<span class=\"qtvfile\"> [ <a href=\"/watch.qtv?sid=%i\">Watch Now</a>]</span>", streams->streamid);
 		Net_ProxySend(cluster, dest, buffer, strlen(buffer));
 		HTMLPRINT("</dt><dd><ul class=\"playerslist\">");
 
@@ -312,7 +344,7 @@ static void HTTPSV_GenerateNowPlaying(cluster_t *cluster, oproxy_t *dest, char *
 
 static void HTTPSV_GenerateCSSFile(cluster_t *cluster, oproxy_t *dest)
 {
-    HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/css", false);
+    HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/css", -1, false);
 
     HTMLPRINT("* { font-family: Verdana, Helvetica, sans-serif; }");
     HTMLPRINT("body { color: #000; background-color: #fff; padding: 0 0px; }");
@@ -388,6 +420,61 @@ static qboolean HTTPSV_GetHeaderField(char *s, char *field, char *buffer, int bu
 	}
 	return false;
 }
+static qboolean HTTPSV_GetHeaderCommaField(char *s, char **ctx, char *field, char *buffer, int buffersize)
+{	//some http header fields are a,b,c,d\ne,f type lists. this function will read one token despite them being split between multiple headers.
+	char *e;	//end of current line...
+	char *colon;
+	int fieldnamelen = strlen(field);
+
+	buffer[0] = 0;
+
+	if (*ctx)
+		e = *ctx;
+	else
+		e = s;
+	if (*e == ',')
+	{
+		colon = e;
+		goto foundfield;
+	}
+	while(*e)
+	{
+		if (*e == '\n')
+		{
+			*e = '\0';
+			colon = strchr(s, ':');
+			*e = '\n';
+			if (colon)
+			{
+				if (fieldnamelen == colon - s)
+				{
+					if (!strncmp(field, s, colon-s))
+					{
+foundfield:
+						colon++;
+						while (*colon == ' ')
+							colon++;
+						while (buffersize > 2)
+						{
+							if (!*colon || *colon == '\r' || *colon == '\n' || *colon == ',')
+								break;
+							*buffer++ = *colon++;
+							buffersize--;
+						}
+						*buffer = 0;
+						*ctx = colon;
+						return true;
+					}
+				}
+
+			}
+			s = e+1;
+		}
+
+		e++;
+	}
+	return false;
+}
 
 static void HTTPSV_GenerateQTVStub(cluster_t *cluster, oproxy_t *dest, char *streamtype, char *streamid)
 {
@@ -448,7 +535,7 @@ static void HTTPSV_GenerateQTVStub(cluster_t *cluster, oproxy_t *dest, char *str
 
 	if (!HTTPSV_GetHeaderField((char*)dest->inbuffer, "Host", hostname, sizeof(hostname)))
 	{
-		HTTPSV_SendHTTPHeader(cluster, dest, "400", "text/html", true);
+		HTTPSV_SendHTTPHeader(cluster, dest, "400", "text/html", -1, true);
 		HTTPSV_SendHTMLHeader(cluster, dest, "QuakeTV: Error", "");
 
 		s = "Your client did not send a Host field, which is required in HTTP/1.1\n<BR />"
@@ -463,15 +550,13 @@ static void HTTPSV_GenerateQTVStub(cluster_t *cluster, oproxy_t *dest, char *str
 	if (strchr(hostname, ':'))
 		*strchr(hostname, ':') = 0;
 
-	HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/x-quaketvident", false);
-
 	snprintf(buffer, sizeof(buffer), "[QTV]\r\n"
 					"Stream: %s%s@%s:%i\r\n"
 					"", 
 					//5, 		256, 		64.	snprintf is not required, but paranoia is a wonderful thing.
 					streamtype, streamid, hostname, cluster->tcplistenportnum);
 
-
+	HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/x-quaketvident", strlen(buffer), false);
 	Net_ProxySend(cluster, dest, buffer, strlen(buffer));
 }
 
@@ -523,14 +608,12 @@ static void HTTPSV_GenerateQWSVStub(cluster_t *cluster, oproxy_t *dest, char *me
 	*s = 0;
 	streamid = fname;
 
-	HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/x-quaketvident", false);
-
 	snprintf(buffer, sizeof(buffer), "[QTV]\r\n"
 					"%s: %s\r\n"
 					"", 
 					method, streamid);
 
-
+	HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/x-quaketvident", strlen(buffer), false);
 	Net_ProxySend(cluster, dest, buffer, strlen(buffer));
 }
 
@@ -589,7 +672,7 @@ static void HTTPSV_GenerateAdmin(cluster_t *cluster, oproxy_t *dest, int streami
 
 	if (!*cluster->adminpassword)
 	{
-		HTTPSV_SendHTTPHeader(cluster, dest, "403", "text/html", true);
+		HTTPSV_SendHTTPHeader(cluster, dest, "403", "text/html", -1, true);
 		HTTPSV_SendHTMLHeader(cluster, dest, "QuakeTV: Admin Error", args);
 
 		s = "The admin password is disabled. You may not log in remotely.</body></html>\n";
@@ -650,7 +733,7 @@ static void HTTPSV_GenerateAdmin(cluster_t *cluster, oproxy_t *dest, int streami
 		o = result;
 	}
 
-	HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/html", true);
+	HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/html", -1, true);
 	HTTPSV_SendHTMLHeader(cluster, dest, "QuakeTV: Admin", args);
 
 	s = "<H1>QuakeTV Admin: ";
@@ -712,7 +795,7 @@ static void HTTPSV_GenerateDemoListing(cluster_t *cluster, oproxy_t *dest, char
 		s++;
 	}
 
-	HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/html", true);
+	HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/html", -1, true);
 	HTTPSV_SendHTMLHeader(cluster, dest, "QuakeTV: Demos", args);
 
 	s = "<h1>QuakeTV: Demo Listing</h1>";
@@ -744,7 +827,7 @@ static void HTTPSV_GeneratePlugin(cluster_t *cluster, oproxy_t *dest)
 	char *html;
 	if (!HTTPSV_GetHeaderField((char*)dest->inbuffer, "Host", hostname, sizeof(hostname)))
 	{
-		HTTPSV_SendHTTPHeader(cluster, dest, "400", "text/html", true);
+		HTTPSV_SendHTTPHeader(cluster, dest, "400", "text/html", -1, true);
 		HTTPSV_SendHTMLHeader(cluster, dest, "QuakeTV: Error", "p");
 
 		html = "Your client did not send a Host field, which is required in HTTP/1.1\n<BR />"
@@ -756,8 +839,7 @@ static void HTTPSV_GeneratePlugin(cluster_t *cluster, oproxy_t *dest)
 		return;
 	}
 
-	HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/html", true);
-	html = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n"
+	html = "<!DOCTYPE HTML>\n"
 		"<HTML><HEAD><TITLE>QuakeTV With Plugin</TITLE>"
 				"  <link rel=\"StyleSheet\" href=\"/style.css\" type=\"text/css\" />\n"
 				"<meta charset='utf-8' />"
@@ -789,16 +871,16 @@ static void HTTPSV_GeneratePlugin(cluster_t *cluster, oproxy_t *dest)
 			"arguments: ["
 				"'-nohome',"
 				"'-manifest',"
-				"'http://triptohell.info/demo.fmf',"
+				"'"WEBPORTMANIFEST"',"
 				"'+connect',"
-				"window.location.host"
+				"(window.location.protocol=='https:'?'wss://':'ws://')+window.location.host"
 			"]"
 		"};"
 
 		//create the script object
 		"var s = document.createElement('script');"
 		// set it up
-		"s.setAttribute('src','http://triptohell.info/ftewebgl.js');"
+		"s.setAttribute('src','/ftewebgl.js');"
 		"s.setAttribute('type','text/javascript');"
 		"s.setAttribute('charset','utf-8');"
 		"s.addEventListener('error', function() {alert('Error loading game script.');}, false);"
@@ -808,10 +890,16 @@ static void HTTPSV_GeneratePlugin(cluster_t *cluster, oproxy_t *dest)
 		//set up some functions that the embedded stuff can use
 		"parent.joinserver = function(d)"
 		"{"
+			"d = '\\nconnect '+d+'\\n';"
+			"FTEC.cbufadd(d);"
+		"}\n"
+		"parent.joinstream = function(d)"
+		"{"
+			"joinserver((window.location.protocol=='https:'?'wss://':'ws://')+window.location.host+'/'+d);"
 		"}\n"
-
 		"parent.playdemo = function(d)"
 		"{"
+			"alert('playdemo'+d);"
 		"}\n"
 
 	"</script>"
@@ -822,19 +910,34 @@ static void HTTPSV_GeneratePlugin(cluster_t *cluster, oproxy_t *dest)
 	"</noscript>"
 
 	"</body></HTML>";
+
+	HTTPSV_SendHTTPHeader(cluster, dest, "200", "text/html", strlen(html), true);
 	Net_ProxySend(cluster, dest, html, strlen(html));
 }
 
-static void HTTPSV_GenerateDownload(cluster_t *cluster, oproxy_t *dest, char *filename, char *svroot)
+static void HTTPSV_GenerateDownload(cluster_t *cluster, oproxy_t *dest, char *filename, char *svroot, char *redir)
 {
 	char fname[256];
 	char link[512];
 	char *s, *suppliedname;
 	int len;
 
+	char *mime = "application/x-forcedownload";
+	if (!strcmp(filename, "/ftewebgl.wasm"))
+		mime = "application/wasm";
+	else if (!strcmp(filename, "/ftewebgl.js"))
+		mime = "text/javascript";
+
 	if (!svroot || !*svroot)
 	{
-		HTTPSV_SendHTTPHeader(cluster, dest, "403", "text/html", true);
+		if (redir)
+		{
+			HTTPPRINT("HTTP/1.0 302 Found\nLocation: ");
+			HTTPPRINT(redir);
+			HTTPPRINT("\n\n");
+			return;
+		}
+		HTTPSV_SendHTTPHeader(cluster, dest, "403", "text/html", -1, true);
 		HTTPSV_SendHTMLHeader(cluster, dest, "Permission denied", "");
 		HTMLPRINT("<h1>403: Forbidden</h1>");
 		HTMLPRINT("File downloads from this proxy are currently not permitted.");
@@ -879,9 +982,9 @@ static void HTTPSV_GenerateDownload(cluster_t *cluster, oproxy_t *dest, char *fi
 	}
 	*s = 0;
 
-	if (*suppliedname == '\\' || *suppliedname == '/' || strstr(suppliedname, "..") || strstr(suppliedname, "//") || strstr(suppliedname, "\\\\") || strchr(suppliedname, ':'))
+	if (!redir && (*suppliedname == '\\' || *suppliedname == '/' || strstr(suppliedname, "..") || strstr(suppliedname, "//") || strstr(suppliedname, "\\\\") || strchr(suppliedname, ':')))
 	{
-		HTTPSV_SendHTTPHeader(cluster, dest, "403", "text/html", true);
+		HTTPSV_SendHTTPHeader(cluster, dest, "403", "text/html", -1, true);
 		HTTPSV_SendHTMLHeader(cluster, dest, "Permission denied", "");
 		HTMLPRINT("<h1>403: Forbidden</h1>");
 
@@ -897,7 +1000,7 @@ static void HTTPSV_GenerateDownload(cluster_t *cluster, oproxy_t *dest, char *fi
 		/*protect id's content (prevent downloading of bsps from pak files - we don't do pak files so just prevent the entire pak)*/
 		if (!stricmp(link+len-4, ".pak"))
 		{
-			HTTPSV_SendHTTPHeader(cluster, dest, "403", "text/html", true);
+			HTTPSV_SendHTTPHeader(cluster, dest, "403", "text/html", -1, true);
 			HTTPSV_SendHTMLHeader(cluster, dest, "Permission denied", "");
 			HTMLPRINT("<h1>403: Forbidden</h1>");
 		
@@ -914,11 +1017,21 @@ static void HTTPSV_GenerateDownload(cluster_t *cluster, oproxy_t *dest, char *fi
 
 	if (dest->srcfile)
 	{
-		HTTPSV_SendHTTPHeader(cluster, dest, "200", "application/x-forcedownload", false);
+		long size;
+		fseek(dest->srcfile, 0, SEEK_END);
+		size = ftell(dest->srcfile);
+		fseek(dest->srcfile, 0, SEEK_SET);
+		HTTPSV_SendHTTPHeader(cluster, dest, "200", mime, size, false);
+	}
+	else if (redir)
+	{
+		HTTPPRINT("HTTP/1.0 302 Found\nLocation: ");
+		HTTPPRINT(redir);
+		HTTPPRINT("\n\n");
 	}
 	else
 	{
-		HTTPSV_SendHTTPHeader(cluster, dest, "404", "text/html", true);
+		HTTPSV_SendHTTPHeader(cluster, dest, "404", "text/html", -1, true);
 		HTTPSV_SendHTMLHeader(cluster, dest, "File not found", "");
 		HTMLPRINT("<h1>404: File not found</h1>");
 
@@ -1036,8 +1149,13 @@ void HTTPSV_PostMethod(cluster_t *cluster, oproxy_t *pend, char *postdata)
 			"\n";	\
 		Net_ProxySend(cluster, pend, s, strlen(s));	\
 	}
+#define REDIRECTIFNEEDED(uri_,url_)	\
+	if (urimatch(uri, uri_, urilen))	\
+	{	\
+		HTTPSV_GenerateDownload(cluster, pend, uri_, cluster->downloaddir, url_);\
+	}
 
-void HTTPSV_GetMethod(cluster_t *cluster, oproxy_t *pend)
+char *HTTPSV_GetMethod(cluster_t *cluster, oproxy_t *pend)
 {
 	char connection[64];
 	char upgrade[64];
@@ -1055,21 +1173,27 @@ void HTTPSV_GetMethod(cluster_t *cluster, oproxy_t *pend)
 		uriend = s;
 	urilen = uriend - uri;
 
-	if (!pend->websocket.websocket && HTTPSV_GetHeaderField((char*)pend->inbuffer, "Connection", connection, sizeof(connection)) && strstr(connection, "Upgrade"))
+	if (!pend->websocket.websocket && uri[0] == '/' && HTTPSV_GetHeaderField((char*)pend->inbuffer, "Connection", connection, sizeof(connection)) && strstr(connection, "Upgrade"))
 	{
 		if (HTTPSV_GetHeaderField((char*)pend->inbuffer, "Upgrade", upgrade, sizeof(upgrade)) && !stricmp(upgrade, "websocket"))
 		{
 			char wsprot[64];
 			char ver[64];
 			char key[64];
+			char *ctx;
 			HTTPSV_GetHeaderField((char*)pend->inbuffer, "Sec-WebSocket-Key", key, sizeof(key));
 
-			HTTPSV_GetHeaderField((char*)pend->inbuffer, "Sec-WebSocket-Protocol", wsprot, sizeof(wsprot));
+			for (ctx = NULL; HTTPSV_GetHeaderCommaField((char*)pend->inbuffer, &ctx, "Sec-WebSocket-Protocol", wsprot, sizeof(wsprot)); )
+			{
+				//if (!strcmp(wsprot, "quake"))	//webquake. we don't support this! (no OOB and missing header flags and some screwy sequence numbers)
+				if (!strcmp(wsprot, "fteqw"))
+					break;	//break out on the first one we know. this is the recommended way...
+			}
 
-			if (strcmp(wsprot, "quake") && strcmp(wsprot, "fteqw"))
+			if (!*wsprot)
 			{
 		#define dest pend
-				HTTPSV_SendHTTPHeader(cluster, pend, "404", "text/html", true);
+				HTTPSV_SendHTTPHeader(cluster, pend, "404", "text/html", -1, true);
 				HTTPSV_SendHTMLHeader(cluster, pend, "Websocket SubProtocol not recognised", "");
 				HTMLPRINT("<h1>Websocket SubProtocol not recognised</h1>");
 				HTTPSV_SendHTMLFooter(cluster, pend);
@@ -1081,7 +1205,7 @@ void HTTPSV_GetMethod(cluster_t *cluster, oproxy_t *pend)
 					"Access-Control-Allow-Origin: *\r\n"	//allow cross-origin requests. this means you can use any domain to play on any public server.
 					"\r\n";
 				Net_ProxySend(cluster, pend, s, strlen(s));
-				return;
+				return NULL;
 			}
 			else
 			{
@@ -1106,13 +1230,16 @@ void HTTPSV_GetMethod(cluster_t *cluster, oproxy_t *pend)
 				pend->droptime = cluster->curtime + 20*1000;
 
 				printf("websocket upgrade\n");
+				pend->drop = false;
+
+				uri[urilen] = 0;	//make sure its null terminated
+				return strdup(uri+1);
 			}
-			pend->drop = false;
-			return;
+			return NULL;
 		}
 	}
 
-	if (urimatch(uri, "/plugin.html", urilen))
+	if (urimatch(uri, "/plugin.html", urilen) || urimatch(uri, "/", urilen))
 	{
 		HTTPSV_GeneratePlugin(cluster, pend);
 	}
@@ -1148,15 +1275,17 @@ void HTTPSV_GetMethod(cluster_t *cluster, oproxy_t *pend)
 	else REDIRECTIF("/", "/plugin.html")
 #endif
 	else REDIRECTIF("/", "/nowplaying.html")
-	else REDIRECTIF("/about.html", PROXYWEBSITE)
-	else REDIRECTIF("/favicon.ico", "http://triptohell.info/favicon.ico")
+	else REDIRECTIFNEEDED("/about.html", PROXYWEBSITE)
+	else REDIRECTIFNEEDED("/favicon.ico",	"https://fte.triptohell.info/favicon.ico")
+	else REDIRECTIFNEEDED("/ftewebgl.js",	"https://fte.triptohell.info/ftewebgl.js")
+	else REDIRECTIFNEEDED("/ftewebgl.wasm",	"https://fte.triptohell.info/ftewebgl.wasm")
 	else if (uriargmatch(uri, "/demos.html", urilen, &args))
 	{
 		HTTPSV_GenerateDemoListing(cluster, pend, args);
 	}
 	else if (!strncmp((char*)pend->inbuffer+4, "/file/", 6))
 	{
-		HTTPSV_GenerateDownload(cluster, pend, (char*)pend->inbuffer+10, cluster->downloaddir);
+		HTTPSV_GenerateDownload(cluster, pend, (char*)pend->inbuffer+10, cluster->downloaddir, NULL);
 	}
 	else if (urimatch(uri, "/style.css", urilen))
 	{
@@ -1165,9 +1294,10 @@ void HTTPSV_GetMethod(cluster_t *cluster, oproxy_t *pend)
 	else
 	{
 #define dest pend
-		HTTPSV_SendHTTPHeader(cluster, dest, "404", "text/html", true);
+		HTTPSV_SendHTTPHeader(cluster, dest, "404", "text/html", -1, true);
 		HTTPSV_SendHTMLHeader(cluster, dest, "Address not recognised", "");
 		HTMLPRINT("<h1>Address not recognised</h1>");
 		HTTPSV_SendHTMLFooter(cluster, dest);
 	}
+	return NULL;
 }
diff --git a/fteqtv/menu.c b/fteqtv/menu.c
index b52d46652..d530b113c 100644
--- a/fteqtv/menu.c
+++ b/fteqtv/menu.c
@@ -288,7 +288,7 @@ void Menu_Draw(cluster_t *cluster, viewer_t *viewer)
 
 	case MENU_MAIN:
 		{
-			WriteString2(&m, "\n\x1d\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1f\n");
+			WriteString2(&m, "\n\x1d\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1f\n");
 			while (viewer->menuop < 0)
 				viewer->menuop += MENU_MAIN_ITEMCOUNT;
 			while (viewer->menuop >= MENU_MAIN_ITEMCOUNT)
@@ -310,7 +310,7 @@ void Menu_Draw(cluster_t *cluster, viewer_t *viewer)
 			WriteStringSelection(&m, i==MENU_MAIN_HELP,			"Help             ");
 			WriteString2(&m,									"                  ");
 
-			WriteString2(&m, "\n\x1d\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1f\n");
+			WriteString2(&m, "\n\x1d\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1e\x1f\n");
 		}
 		break;
 
diff --git a/fteqtv/parse.c b/fteqtv/parse.c
index e87397b80..323004d8c 100644
--- a/fteqtv/parse.c
+++ b/fteqtv/parse.c
@@ -1743,6 +1743,7 @@ void ParseMessage(sv_t *tv, void *buffer, int length, int to, int mask)
 #ifndef _MSC_VER
 	#warning QTV is meant to disconnect when servers tells it to.
 #endif
+				QTV_Printf(tv, "Maliciously ignoring svc_disconnect from upstream...\n");	//ideally the client would be the one to close() the socket first so its the one that gets stuck in TIME_WAIT instead of the server.
 				// FIXME: Servers are today sending the svc_disconnect in a non-standard way, which makes QTV drop when it shouldn't.
 				// Tell the server developers to fix the servers.
 				//tv->drop = true;
diff --git a/fteqtv/qtv.h b/fteqtv/qtv.h
index 1bf8b7956..32bc99cdd 100644
--- a/fteqtv/qtv.h
+++ b/fteqtv/qtv.h
@@ -570,6 +570,7 @@ typedef struct tcpconnect_s
 	SOCKET sock;
 	wsrbuf_t websocket;
 	netadr_t peeraddr;
+	char *initialstreamname;
 
 	unsigned char inbuffer[MAX_PROXY_INBUFFER];
 	unsigned int inbuffersize;	//amount of data available.
@@ -918,7 +919,7 @@ void ParseMessage(sv_t *tv, void *buffer, int length, int to, int mask);
 void BuildServerData(sv_t *tv, netmsg_t *msg, int servercount, viewer_t *spectatorflag);
 void BuildNQServerData(sv_t *tv, netmsg_t *msg, qboolean mvd, int servercount);
 void QW_UpdateUDPStuff(cluster_t *qtv);
-void QW_TCPConnection(cluster_t *cluster, SOCKET sock, wsrbuf_t ws);
+void QW_TCPConnection(cluster_t *cluster, oproxy_t *sock, char *initialstringname/*strduped*/);
 unsigned int Sys_Milliseconds(void);
 void Prox_SendInitialEnts(sv_t *qtv, oproxy_t *prox, netmsg_t *msg);
 qboolean QTV_ConnectStream(sv_t *qtv, char *serverurl);
@@ -1009,7 +1010,7 @@ void Fwd_SayToDownstream(sv_t *qtv, char *message);
 
 
 //httpsv.c
-void HTTPSV_GetMethod(cluster_t *cluster, oproxy_t *pend);
+char *HTTPSV_GetMethod(cluster_t *cluster, oproxy_t *pend);	//if a websocket request, return value is the stream name
 void HTTPSV_PostMethod(cluster_t *cluster, oproxy_t *pend, char *postdata);
 void tobase64(unsigned char *out, int outlen, unsigned char *in, int inlen);
 
diff --git a/fteqtv/qw.c b/fteqtv/qw.c
index 4c761041e..99ee522a6 100644
--- a/fteqtv/qw.c
+++ b/fteqtv/qw.c
@@ -725,7 +725,27 @@ void NewClient(cluster_t *cluster, viewer_t *viewer)
 {
 	sv_t *initialserver;
 	initialserver = NULL;
-	if (*cluster->autojoinadr)
+
+	if (viewer->netchan.remote_address.tcpcon)
+	{
+		tcpconnect_t *dest;
+		for (dest = cluster->tcpconnects; dest; dest = dest->next)
+		{
+			if (dest == viewer->netchan.remote_address.tcpcon)
+				break;
+		}
+
+		if (*dest->initialstreamname)
+		{
+			initialserver = QTV_NewServerConnection(cluster, 0, dest->initialstreamname, "", false, AD_WHENEMPTY, true, false);
+			if (initialserver && initialserver->sourcetype == SRC_UDP)
+				initialserver->controller = viewer;
+		}
+	}
+
+	if (initialserver)
+		;	//already picked it via websocket resources.
+	else if (*cluster->autojoinadr)
 	{
 		initialserver = QTV_NewServerConnection(cluster, 0, cluster->autojoinadr, "", false, AD_WHENEMPTY, true, false);
 		if (initialserver && initialserver->sourcetype == SRC_UDP)
@@ -3743,6 +3763,10 @@ void ParseQWC(cluster_t *cluster, sv_t *qtv, viewer_t *v, netmsg_t *m)
 				if (v->server && v->server->controller == v)
 					SendClientCommand(v->server, "%s", buf+4);
 			}
+			else if (iscont && !strncmp(buf, "pext ", 5))
+			{	//FIXME: include ones we can parse properly...
+				SendClientCommand(v->server, "pext");
+			}
 			else if (!iscont && !strcmp(buf, "new"))
 			{
 				if (qtv && qtv->parsingconnectiondata)
@@ -4404,29 +4428,47 @@ void QW_ProcessUDPPacket(cluster_t *cluster, netmsg_t *m, netadr_t from)
 	}
 }
 
-void QW_TCPConnection(cluster_t *cluster, SOCKET sock, wsrbuf_t ws)
+void QW_TCPConnection(cluster_t *cluster, oproxy_t *sock, char *initialstreamname)
 {
 	int alen;
 	tcpconnect_t *tc;
-	tc = malloc(sizeof(*tc));
+
+	//clean up the pending source a bit...
+	if (sock->srcfile) fclose(sock->srcfile), sock->srcfile = NULL;
+
+	if (sock->drop)
+		tc = NULL;	//FIXME
+	else
+		tc = malloc(sizeof(*tc));
 	if (!tc)
 	{
-		closesocket(sock);
-		return;
+		closesocket(sock->sock);
+		free(initialstreamname);
 	}
-	tc->sock = sock;
-	tc->websocket = ws;
-	tc->inbuffersize = 0;
-	tc->outbuffersize = 0;
+	else
+	{
+		tc->sock = sock->sock;
+		tc->websocket = sock->websocket;	//copy it over
 
-	memset(&tc->peeraddr, 0, sizeof(tc->peeraddr));
-	tc->peeraddr.tcpcon = tc;
+		tc->inbuffersize = sock->inbuffersize;
+		memcpy(tc->inbuffer, sock->inbuffer, tc->inbuffersize);
+		tc->outbuffersize = sock->buffersize;
+		memcpy(tc->outbuffer, sock->buffer+sock->bufferpos, tc->outbuffersize);
 
-	alen = sizeof(tc->peeraddr.sockaddr);
-	getpeername(sock, (struct sockaddr*)&tc->peeraddr.sockaddr, &alen);
+		memset(&tc->peeraddr, 0, sizeof(tc->peeraddr));
+		tc->peeraddr.tcpcon = tc;
 
-	tc->next = cluster->tcpconnects;
-	cluster->tcpconnects = tc;
+		alen = sizeof(tc->peeraddr.sockaddr);
+		getpeername(sock->sock, (struct sockaddr*)&tc->peeraddr.sockaddr, &alen);
+
+		tc->initialstreamname = initialstreamname;
+		tc->next = cluster->tcpconnects;
+		cluster->tcpconnects = tc;
+	}
+
+	//okay, we're done with it.
+	free(sock);
+	cluster->numproxies--;
 }
 
 void QW_UpdateUDPStuff(cluster_t *cluster)
@@ -4491,6 +4533,19 @@ void QW_UpdateUDPStuff(cluster_t *cluster)
 		QW_ProcessUDPPacket(cluster, &m, from);
 	}
 
+	for (tc = cluster->tcpconnects; tc; tc = tc->next)
+	{
+		if (tc->outbuffersize)
+		{
+			int clen = send(tc->sock, tc->outbuffer, tc->outbuffersize, 0);
+			if (clen > 0)
+			{
+				memmove(tc->outbuffer, tc->outbuffer+clen, tc->outbuffersize-clen);
+				tc->outbuffersize-=clen;
+			}
+		}
+	}
+
 	for (l = &cluster->tcpconnects; *l; )
 	{
 		int clen;
@@ -4504,7 +4559,9 @@ void QW_UpdateUDPStuff(cluster_t *cluster)
 			if (read == 0 || qerrno != NET_EWOULDBLOCK)
 			{
 				*l = tc->next;
-				closesocket(tc->sock);
+				if (tc->sock != INVALID_SOCKET)
+					closesocket(tc->sock);
+				free(tc->initialstreamname);
 				free(tc);
 				continue;
 			}
diff --git a/games/ktx.fmf b/games/ktx.fmf
new file mode 100644
index 000000000..cbdf588c0
--- /dev/null
+++ b/games/ktx.fmf
@@ -0,0 +1,18 @@
+//this file is intended for dedicated servers, but I guess clients might have reason to use it too. expect quirks though.
+
+FTEMANIFEST 1
+game quake
+name "nQuakeSV-KTX"
+gamedir ktx
+
+homedirmode never	//auto/always
+
+downloadsurl https://fte.triptohell.info/moodles/ktx.meta
+install quake_shareware		//we need(ish) a pak0!
+install nquakesv_configs	//ktx breaks without some configs
+install nquakesv_gamecode	//can't run ktx without ktx!
+//install nquakesv_maps		//urgh, massive bloated download.
+
+//gah, make sure stuff still works when embedded in a browser.
+archivedpackage id1/pak0.pak 0x4f069cac id1/pak0.pak https://fte.triptohell.info/qsw106.zip
+
diff --git a/games/xonotic_85.fmf b/games/xonotic_85.fmf
index 1d7e7f869..35557876d 100644
--- a/games/xonotic_85.fmf
+++ b/games/xonotic_85.fmf
@@ -8,15 +8,16 @@ basegame data
 basegame *ftedata	//so stuff gets written here instead.
 
 //xonotic 0.8.5 packages.
-package "data/font-unifont-20220627.pk3"			crc 0xa39ce3ad mirror "unzip:Xonotic/data/font-unifont-20220627.pk3,https://github.com/garymoon/xonotic/releases/download/xonotic-v0.8.5/xonotic-0.8.5.zip"
-package "data/font-xolonium-20220627.pk3"			crc 0x9553d8a4 mirror "unzip:Xonotic/data/font-xolonium-20220627.pk3,https://github.com/garymoon/xonotic/releases/download/xonotic-v0.8.5/xonotic-0.8.5.zip"
-package "data/xonotic-20220627-data.pk3"			crc 0x57a1ba9c mirror "unzip:Xonotic/data/xonotic-20220627-data.pk3,https://github.com/garymoon/xonotic/releases/download/xonotic-v0.8.5/xonotic-0.8.5.zip"
-package "data/xonotic-20220627-maps.pk3"			crc 0x1d3d7cf1 mirror "unzip:Xonotic/data/xonotic-20220627-maps.pk3,https://github.com/garymoon/xonotic/releases/download/xonotic-v0.8.5/xonotic-0.8.5.zip"
-package "data/xonotic-20220627-music.pk3"			crc 0x5d1dd373 mirror "unzip:Xonotic/data/xonotic-20220627-music.pk3,https://github.com/garymoon/xonotic/releases/download/xonotic-v0.8.5/xonotic-0.8.5.zip"
-package "data/xonotic-20220627-nexcompat.pk3"		crc 0x83f613b9 mirror "unzip:Xonotic/data/xonotic-20220627-nexcompat.pk3,https://github.com/garymoon/xonotic/releases/download/xonotic-v0.8.5/xonotic-0.8.5.zip"
+//package "data/font-unifont-20220627.pk3"			crc 0xa39ce3ad mirror "unzip:Xonotic/data/font-unifont-20220627.pk3,https://github.com/garymoon/xonotic/releases/download/xonotic-v0.8.5/xonotic-0.8.5.zip"
+//package "data/font-xolonium-20220627.pk3"			crc 0x9553d8a4 mirror "unzip:Xonotic/data/font-xolonium-20220627.pk3,https://github.com/garymoon/xonotic/releases/download/xonotic-v0.8.5/xonotic-0.8.5.zip"
+//package "data/xonotic-20220627-data.pk3"			crc 0x57a1ba9c mirror "unzip:Xonotic/data/xonotic-20220627-data.pk3,https://github.com/garymoon/xonotic/releases/download/xonotic-v0.8.5/xonotic-0.8.5.zip"
+//package "data/xonotic-20220627-maps.pk3"			crc 0x1d3d7cf1 mirror "unzip:Xonotic/data/xonotic-20220627-maps.pk3,https://github.com/garymoon/xonotic/releases/download/xonotic-v0.8.5/xonotic-0.8.5.zip"
+//package "data/xonotic-20220627-music.pk3"			crc 0x5d1dd373 mirror "unzip:Xonotic/data/xonotic-20220627-music.pk3,https://github.com/garymoon/xonotic/releases/download/xonotic-v0.8.5/xonotic-0.8.5.zip"
+//package "data/xonotic-20220627-nexcompat.pk3"		crc 0x83f613b9 mirror "unzip:Xonotic/data/xonotic-20220627-nexcompat.pk3,https://github.com/garymoon/xonotic/releases/download/xonotic-v0.8.5/xonotic-0.8.5.zip"
 
 //This sucks. overrides the *.dat files to work around gmqcc bugs (also smaller dat files at runtime, but still stupid and annoying and means compat hits the fan when using the standard csprogs on dp servers)
-package "data/xonotic-fixups-0.8.5.pk3"	crc 0xe27b8ad3 //mirror "xonotic-fixups-0.8.5.pk3"
+//  cd qcsrc && make QCC=fteqcc QCCFLAGS_WERROR= && zip xonotic-fixups-9.8.5.pk3 ../*.dat ../*.lno
+//package "data/xonotic-fixups-0.8.5.pk3"	crc 0xe27b8ad3 //mirror "xonotic-fixups-0.8.5.pk3"
 //-set pr_fixbrokenqccarrays 2	//this can be used instead, but can cause its own problems.
 
 
diff --git a/imgtool.c b/imgtool.c
index 43e2e28da..52483ce03 100644
--- a/imgtool.c
+++ b/imgtool.c
@@ -171,7 +171,7 @@ qboolean FS_Remove (const char *path, enum fs_relative relativeto)
 		return false;
 	return true;
 }
-qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out, int outlen)
+qboolean FS_SystemPath(const char *fname, enum fs_relative relativeto, char *out, int outlen)
 {
 	Q_strncpyz(out, fname, outlen);
 	return true;
@@ -1305,7 +1305,7 @@ static struct pendingtextureinfo *ImgTool_DecodeMiptex(struct opts_s *args, mipt
 
 	out->encoding = PTI_INVALID;
 
-	Con_DPrintf("%s: width %i, height %i\n", mip->name, mip->width, mip->height);
+	Con_DPrintf("%s: width %u, height %u, size %u\n", mip->name, mip->width, mip->height, (unsigned int)size);
 
 	//header [legacymip0 legacymip1 legacymip2] [extsize extcode extdata]*n [legacymip3]
 	//extcode NAME: extdata-8 bytes of replacement name
@@ -1315,10 +1315,10 @@ static struct pendingtextureinfo *ImgTool_DecodeMiptex(struct opts_s *args, mipt
 	//legacy-only data is densely packed or whatever.
 	//half-life palette data might be glued onto the end. we don't care to handle that.
 	Con_DPrintf("%i bytes of extended data\n", (unsigned)(dataend-data));
-	Con_DPrintf("offset[0]: %i\n", mip->offsets[0]);
-	Con_DPrintf("offset[1]: %i\n", mip->offsets[1]);
-	Con_DPrintf("offset[2]: %i\n", mip->offsets[2]);
-	Con_DPrintf("offset[3]: %i\n", mip->offsets[3]);
+	Con_DPrintf("offset[0]: %u\n", mip->offsets[0]);
+	Con_DPrintf("offset[1]: %u\n", mip->offsets[1]);
+	Con_DPrintf("offset[2]: %u\n", mip->offsets[2]);
+	Con_DPrintf("offset[3]: %u\n", mip->offsets[3]);
 	if (data+4 < dataend && data[0]==0x00 && data[1]==0xfb&&data[2]==0x2b&&data[3]==0xaf)	//magic id to say that there's actually extensions here...
 	{
 		data+=4;
@@ -1447,8 +1447,15 @@ static struct pendingtextureinfo *ImgTool_DecodeMiptex(struct opts_s *args, mipt
 				out->mip[out->mipcount].width = mip->width>>out->mipcount;
 				out->mip[out->mipcount].height = mip->height>>out->mipcount;
 				out->mip[out->mipcount].depth = 1;
-				out->mip[out->mipcount].datasize = out->mip[out->mipcount].width*out->mip[out->mipcount].height*out->mip[out->mipcount].depth;
+				out->mip[out->mipcount].datasize = out->mip[out->mipcount].width*(size_t)out->mip[out->mipcount].height*out->mip[out->mipcount].depth;
 				out->mip[out->mipcount].data = (char*)mip + mip->offsets[out->mipcount];
+
+				if (mip->offsets[out->mipcount]+out->mip[out->mipcount].datasize > size)
+				{
+					out->mip[out->mipcount].data = mip;
+					out->mip[out->mipcount].datasize = 0;
+					Con_Printf("%s: Mip%i offsets/size exceed size of texture\n", mip->name, out->mipcount);
+				}
 			}
 		}
 	}
@@ -1461,7 +1468,10 @@ static struct pendingtextureinfo *ImgTool_DecodeMiptex(struct opts_s *args, mipt
 			continue;
 		if (out->mip[i].data < (void*)mip ||
 			(char*)out->mip[i].data+out->mip[i].datasize > (char*)mip+size)
+		{
+			Con_Printf("%s: Corrupt mip %i\n", mip->name, i);
 			return NULL;
+		}
 	}
 
 	if (args)
@@ -1534,39 +1544,52 @@ static void ImgTool_Enumerate(struct opts_s *args, const char *inname, void(*cal
 					unsigned int w=0;
 					unsigned int h=0;
 					in = NULL;
-					if (sz >= 8)
-					{
-						w = (indata[e->offset+0]<<0)|(indata[e->offset+1]<<8)|(indata[e->offset+2]<<16)|(indata[e->offset+3]<<24);
-						h = (indata[e->offset+4]<<0)|(indata[e->offset+5]<<8)|(indata[e->offset+6]<<16)|(indata[e->offset+7]<<24);
-					}
-					if (sz == w*h+8)
-					{	//quake
+					if (!strcasecmp(e->name, "CONCHARS") && (e->size==128*128 || e->size==128*128+8))
+					{	//special hack for buggy conchars, which is listed as a miptex for some reason, with no qpic header (it not being a qpic lump)
+						printf("\t%16.16s: corrupt CONCHARS lump - wrongly marked as qpic. Treating as a legacy engine would...\n", e->name);
 						in = Z_Malloc(sizeof(*in));
-						in->encoding = PTI_P8;
-						in->mip[0].data = indata+e->offset+8;
-						in->mip[0].datasize = w*h;
-					}
-					else if (((sz+3)&~3) == (((w*h+10+768+3)&~3)))
-					{	//halflife
-						const unsigned char *src = indata+e->offset+8;
-						const unsigned char *pal = indata+e->offset+8+w*h+2, *p;
-						unsigned char *dst;
-						sz = w*h;
-						in = Z_Malloc(sizeof(*in)+w*h*3);
-						in->encoding = PTI_RGB8;
-						in->mip[0].data = dst = (unsigned char*)(in+1);
-						in->mip[0].datasize = sz*3;
-
-						while (sz --> 0)
-						{
-							p = pal+*src++*3;
-							*dst++ = *p++;
-							*dst++ = *p++;
-							*dst++ = *p++;
-						}
+						in->encoding = TF_H2_TRANS8_0;
+						in->mip[0].data = indata+e->offset;
+						in->mip[0].datasize = 128*128;
+						w = 128;
+						h = 128;
 					}
 					else
-						printf("\t%16.16s: missized qpic (%u %u, %u bytes)\n", e->name, w, h, (unsigned int)sz);
+					{
+						if (sz >= 8)
+						{
+							w = (indata[e->offset+0]<<0)|(indata[e->offset+1]<<8)|(indata[e->offset+2]<<16)|(indata[e->offset+3]<<24);
+							h = (indata[e->offset+4]<<0)|(indata[e->offset+5]<<8)|(indata[e->offset+6]<<16)|(indata[e->offset+7]<<24);
+						}
+						if (sz == w*h+8)
+						{	//quake
+							in = Z_Malloc(sizeof(*in));
+							in->encoding = TF_TRANS8;
+							in->mip[0].data = indata+e->offset+8;
+							in->mip[0].datasize = w*h;
+						}
+						else if (((sz+3)&~3) == (((w*h+10+768+3)&~3)))
+						{	//halflife
+							const unsigned char *src = indata+e->offset+8;
+							const unsigned char *pal = indata+e->offset+8+w*h+2, *p;
+							unsigned char *dst;
+							sz = w*h;
+							in = Z_Malloc(sizeof(*in)+w*h*3);
+							in->encoding = PTI_RGB8;
+							in->mip[0].data = dst = (unsigned char*)(in+1);
+							in->mip[0].datasize = sz*3;
+
+							while (sz --> 0)
+							{
+								p = pal+*src++*3;
+								*dst++ = *p++;
+								*dst++ = *p++;
+								*dst++ = *p++;
+							}
+						}
+						else
+							printf("\t%16.16s: missized qpic (%u %u, %u bytes)\n", e->name, w, h, (unsigned int)sz);
+					}
 					if (in)
 					{
 //						printf("\n");
@@ -3119,10 +3142,11 @@ static void ImgTool_View(const char *inname, struct pendingtextureinfo *in)
 	qboolean outformats[PTI_MAX] = {false};
 	struct sdlwindow_s *wc;
 	SDL_Event ev;
-	uploadfmt_t origencoding = in->encoding;
+	uploadfmt_t origencoding;
 
-	if (in->mipcount < 1 || in->mip[0].width <= 0 || in->mip[0].height <= 0)
+	if (!in || in->mipcount < 1 || in->mip[0].width <= 0 || in->mip[0].height <= 0)
 		return;
+	origencoding = in->encoding;
 
 	if (!SDLL_Setup())
 	{
@@ -3245,7 +3269,7 @@ static void ImgTool_View(const char *inname, struct pendingtextureinfo *in)
 		}
 		else
 		{
-			printf("Unable to create texture\n");
+			printf("Unable to create texture %s %u*%u\n", Image_FormatName(in->encoding), in->mip[0].width, in->mip[0].height);
 			BZ_Free(wc->tex[wc->texcount].name);
 		}
 	}
diff --git a/iqm/iqm.cpp b/iqm/iqm.cpp
index 23c7ffa47..ec63fc97f 100644
--- a/iqm/iqm.cpp
+++ b/iqm/iqm.cpp
@@ -1,7 +1,9 @@
 #ifdef IQMTOOL
 	//building as part of fte. we can pull in fte components for extra features.
 	#define FTEPLUGIN
-	#define GLQUAKE	//this is shit, but ensures index sizes come out the right size
+	#ifndef GLQUAKE
+		#define GLQUAKE	//this is shit, but ensures index sizes come out the right size
+	#endif
 	#include "../plugins/plugin.h"
 	#include "com_mesh.h"
 
@@ -4211,7 +4213,7 @@ namespace fte
 						float time = f/anim.rate;
 						float *bonedata;
 						if (anim.GetRawBones)
-							bonedata = anim.GetRawBones(surf, &anim, time, bonebuf.reserve(surf->numbones)[0], surf->numbones);
+							bonedata = anim.GetRawBones(surf, &anim, time, bonebuf.reserve(surf->numbones)[0], NULL, surf->numbones);
 						else if (anim.boneofs)
 							bonedata = (float*)anim.boneofs;
 						else
diff --git a/plugins/Makefile b/plugins/Makefile
index 6a40d885a..f2746c872 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -98,6 +98,7 @@ ifeq ($(FTE_TARGET),droid)
 	PLUG_CFLAGS=-DANDROID
 	PLUG_CXXFLAGS=-DANDROID
 endif
+ARCHLIBS=../engine/libs-$(ARCH)
 
 #fallback
 PLUG_NATIVE_EXT?=.so
@@ -108,9 +109,9 @@ PLUG_CXXFLAGS?=-fPIC -Wl,--no-undefined -Bsymbolic -fvisibility=hidden -static-l
 PLUG_CMAKE?=-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
 PLUG_LDFLAGS_ZLIB?=
 ARCH:=$(shell $(CC) -dumpmachine)
-PLUG_LDFLAGS:=-L../engine/libs-$(ARCH) $(PLUG_LDFLAGS)
-PLUG_CFLAGS:=-I../engine/libs-$(ARCH) $(PLUG_CFLAGS)
-PLUG_CXXFLAGS:=-I../engine/libs-$(ARCH) $(PLUG_CXXFLAGS)
+PLUG_LDFLAGS:=-L$(ARCHLIBS) $(PLUG_LDFLAGS)
+PLUG_CFLAGS:=-I$(ARCHLIBS) $(PLUG_CFLAGS)
+PLUG_CXXFLAGS:=-I$(ARCHLIBS) $(PLUG_CXXFLAGS)
 
 #$1 is the plugin name, $2 is its filename, $3 is title, $4 is description
 define EMBEDMETA
@@ -442,12 +443,15 @@ NATIVE_PLUGINS+=irc
 
 ######################################
 #OpenXR plugin, for use with VR headsets.
-$(PLUG_PREFIX)openxr$(PLUG_NATIVE_EXT): openxr.c plugin.c
+#the tar.gz has a stupid name
+OPENXRVER=1.0.33
+$(ARCHLIBS)/openxr/openxr.h:
+	cd $(ARCHLIBS)/.. && (test -f release-$(OPENXRVER).tar.gz || wget https://github.com/KhronosGroup/OpenXR-SDK/archive/refs/tags/release-$(OPENXRVER).tar.gz)
+	cd $(ARCHLIBS) && tar -xvzf ../release-$(OPENXRVER).tar.gz --strip-components=2 OpenXR-SDK-release-$(OPENXRVER)/include/openxr/
+$(PLUG_PREFIX)openxr$(PLUG_NATIVE_EXT): openxr.c plugin.c $(ARCHLIBS)/openxr/openxr.h
 	$(CC) $(BASE_CFLAGS) $(CFLAGS) -DFTEPLUGIN -o $@ -shared $(PLUG_CFLAGS) $^ $(PLUG_DEFFILE) $(PLUG_LDFLAGS) -DXR_NO_PROTOTYPES `$(PKGCONFIG) --cflags openxr` -DGLQUAKE -DVKQUAKE -DD3D11QUAKE
 	$(call EMBEDMETA,openxr,$@,OpenXR Support,Enables the use of Virtual Reality headsets and inputs.)
-ifeq ($(shell $(PKGCONFIG) --exists openxr && echo 1),1)
 NATIVE_PLUGINS+=openxr
-endif
 ######################################
 
 ######################################
@@ -478,7 +482,6 @@ endif
 #statically link openssl on the above systems (instead of depending on system libs)
 ifneq ($(OSSL_ARCH),)
 OSSL_VERSION=3.0.1
-ARCHLIBS=../engine/libs-$(ARCH)
 #../engine/libs-$(ARCH)/openssl-$(OSSL_VERSION).tar.gz:
 ../engine/openssl-$(OSSL_VERSION).tar.gz:
 	wget -O $@ -N https://github.com/openssl/openssl/archive/refs/tags/openssl-$(OSSL_VERSION).tar.gz
diff --git a/plugins/avplug/avdecode.c b/plugins/avplug/avdecode.c
index cd65c5e8a..d1d1b53cb 100644
--- a/plugins/avplug/avdecode.c
+++ b/plugins/avplug/avdecode.c
@@ -48,6 +48,7 @@ struct decctx
 	AVFrame         *pVFrame;
 	int64_t num, denum;
 	int64_t lasttime;
+	int64_t timeoffset;	//timestamp of first video frame
 
 	uint8_t *rgb_data;
 	int rgb_linesize;
@@ -288,6 +289,11 @@ having them tied to the libavformat network IO.
 				ctx->num = ctx->pFormatCtx->streams[ctx->videoStream]->time_base.num;
 				ctx->denum = ctx->pFormatCtx->streams[ctx->videoStream]->time_base.den;
 
+				if (ctx->pFormatCtx->streams[ctx->videoStream]->start_time != AV_NOPTS_VALUE)
+					ctx->timeoffset = ctx->pFormatCtx->streams[ctx->videoStream]->start_time;
+				else
+					ctx->timeoffset = 0;	//should probably guess.
+
 				// Open codec
 				if(pCodec!=NULL && avcodec_open2(ctx->pVCodecCtx, pCodec, NULL) >= 0)
 				{
@@ -325,10 +331,11 @@ static qboolean VARGS AVDec_DisplayFrame(void *vctx, qboolean nosound, qboolean
 	
 	while (1)
 	{
-		if (ctx->lasttime > curtime)
+		if (ctx->lasttime >= curtime)
 			break;
 
 		// We're ahead of the previous frame. try and read the next.
+		//FIXME: when streaming, av_read_frame will _block_ and that sucks big hairy donkey balls.
 		if (av_read_frame(ctx->pFormatCtx, &packet) < 0)
 		{
 			if (repainted)
@@ -347,7 +354,13 @@ static qboolean VARGS AVDec_DisplayFrame(void *vctx, qboolean nosound, qboolean
 				ctx->pScaleCtx = sws_getCachedContext(ctx->pScaleCtx, ctx->pVCodecCtx->width, ctx->pVCodecCtx->height, ctx->pVCodecCtx->pix_fmt, ctx->width, ctx->height, AV_PIX_FMT_BGRA, SWS_POINT, 0, 0, 0);
 				sws_scale(ctx->pScaleCtx, (void*)ctx->pVFrame->data, ctx->pVFrame->linesize, 0, ctx->pVCodecCtx->height, &ctx->rgb_data, &ctx->rgb_linesize);
 
-				ctx->lasttime = ctx->pVFrame->best_effort_timestamp;
+				ctx->lasttime = ctx->pVFrame->best_effort_timestamp-ctx->timeoffset;
+
+				if (!ctx->file && curtime - ctx->lasttime > (1 * ctx->denum) / ctx->num)
+				{
+					ctx->timeoffset = ctx->pVFrame->best_effort_timestamp-curtime;
+					ctx->lasttime = curtime;
+				}
 				repainted = true;
 			}
 		}
diff --git a/plugins/ezhud/ezquakeisms.c b/plugins/ezhud/ezquakeisms.c
index d3fae9dc7..ecb04da19 100644
--- a/plugins/ezhud/ezquakeisms.c
+++ b/plugins/ezhud/ezquakeisms.c
@@ -1,12 +1,15 @@
-#include "../plugin.h"
 #include "ezquakeisms.h"
 #include "hud.h"
 #include "hud_editor.h"
 
+#ifdef FTEENGINE
+#define Plug_Init Plug_EZHud_Init
+#else
 plug2dfuncs_t *drawfuncs;
 plugclientfuncs_t *clientfuncs;
 plugfsfuncs_t *filefuncs;
 pluginputfuncs_t *inputfuncs;
+#endif
 
 struct ezcl_s cl;
 struct ezcls_s cls;
@@ -201,7 +204,7 @@ void Draw_ColoredString3(float x, float y, const char *str, clrinfo_t *clr, int
 	drawfuncs->String(x, y, str);
 	drawfuncs->Colour4f(1, 1, 1, 1);
 }
-void UI_PrintTextBlock(void)
+void UI_PrintTextBlock(float x, float y, float w, float h, char *str, int flags)
 {
 }
 void Draw_AlphaRectangleRGB(int x, int y, int w, int h, int foo, int bar, byte r, byte g, byte b, byte a)
@@ -268,7 +271,7 @@ int dehex(char nib)
 		return nib - 'A' + 10;
 	return 0;
 }
-char *TP_ParseFunChars(char *str, qbool chat)
+char *TP_ParseFunChars(char *str)
 {
 	static char resultbuf[1024];
 	char *out = resultbuf, *end = resultbuf+sizeof(resultbuf)-1;
@@ -326,7 +329,41 @@ char *TP_ParseFunChars(char *str, qbool chat)
 }
 char *TP_ItemName(unsigned int itbit)
 {
-	return "Dunno";
+	cvar_t *var = NULL;
+	switch (itbit)
+	{
+#define ITEMNAME(it, nam)	case it: var = cvarfuncs->GetNVFDG("tp_name_"#nam, #nam, 0, NULL, "Item Names"); break
+	ITEMNAME(IT_SHOTGUN,			sg);
+	ITEMNAME(IT_SUPER_SHOTGUN,		ssg);
+	ITEMNAME(IT_NAILGUN,			ng);
+	ITEMNAME(IT_SUPER_NAILGUN,		sng);
+	ITEMNAME(IT_GRENADE_LAUNCHER,	gl);
+	ITEMNAME(IT_ROCKET_LAUNCHER,	rl);
+	ITEMNAME(IT_LIGHTNING,			lg);
+//	ITEMNAME(IT_SUPER_LIGHTNING,	???);
+	ITEMNAME(IT_SHELLS,				shells);
+	ITEMNAME(IT_NAILS,				nails);
+	ITEMNAME(IT_ROCKETS,			rockets);
+	ITEMNAME(IT_CELLS,				cells);
+	ITEMNAME(IT_AXE,				axe);
+	ITEMNAME(IT_ARMOR1,				ga);
+	ITEMNAME(IT_ARMOR2,				ya);
+	ITEMNAME(IT_ARMOR3,				ra);
+	ITEMNAME(IT_SUPERHEALTH,		mh);
+//	ITEMNAME(IT_KEY1,				);
+//	ITEMNAME(IT_KEY2,				);
+	ITEMNAME(IT_INVISIBILITY,		ring);
+	ITEMNAME(IT_INVULNERABILITY,	pent);
+	ITEMNAME(IT_SUIT,				suit);
+	ITEMNAME(IT_QUAD,				quad);
+//	ITEMNAME(IT_SIGIL1,				);
+//	ITEMNAME(IT_SIGIL2,				);
+//	ITEMNAME(IT_SIGIL3,				);
+//	ITEMNAME(IT_SIGIL4,				);
+	}
+	if (var)
+		return var->string;
+	return va("it%#x", itbit);
 }
 
 void Replace_In_String(char *src, size_t strsize, char leadchar, int patterns, ...)
@@ -512,11 +549,6 @@ void EZHud_UseNquake_f(void)
 	cmdfuncs->AddText(hudstr, true);
 }
 
-qboolean Cmd_AddCommand	(const char *funcname, xcommand_t function)
-{
-	return cmdfuncs->AddCommand(funcname, function, NULL);
-};
-
 int IN_BestWeapon(void)
 {
 	return 0;
diff --git a/plugins/ezhud/ezquakeisms.h b/plugins/ezhud/ezquakeisms.h
index c85927e66..a1fa1ddcc 100644
--- a/plugins/ezhud/ezquakeisms.h
+++ b/plugins/ezhud/ezquakeisms.h
@@ -1,4 +1,10 @@
 //ezquake likes this
+#ifndef FTEPLUGIN
+#include "quakedef.h"
+#define FTEENGINE	//we're getting statically linked. lucky us.
+#define FTEPLUGIN
+#endif
+#include "../plugin.h"
 #include <assert.h>
 #include <ctype.h>
 
@@ -22,6 +28,7 @@ extern pluginputfuncs_t *inputfuncs;
 #define Cvar_Find(n) cvarfuncs->GetNVFDG(n,NULL,0,NULL,NULL)
 #define Cvar_SetValue(var,val) cvarfuncs->SetFloat(var->name,val)
 #define Cvar_Set(var,val) cvarfuncs->SetString(var->name,val)
+#define Cmd_AddCommand(nam,ptr) cmdfuncs->AddCommand(nam,ptr,NULL)
 #define Cmd_Argc cmdfuncs->Argc
 #define Cbuf_AddText(x) cmdfuncs->AddText(x,false)
 #define Sys_Error(x) plugfuncs->Error(x)
@@ -31,8 +38,24 @@ extern pluginputfuncs_t *inputfuncs;
 #define Q_free free
 #define Q_rint(x) ((int)(x+0.5))
 #define Q_atoi atoi
-#define strlcpy Q_strlcpy
-#define strlcat Q_strlcat
+#ifdef FTEENGINE
+	#define strlcpy Q_strncpyz
+	#define strlcat Q_strncatz
+#else
+	#define strlcpy Q_strlcpy
+	#define strlcat Q_strlcat
+#endif
+
+//ezhud has a number of common symbol conflicts, which matter when sttatically linking into the engine
+#define Cmd_Argv			ezCmd_Argv
+#define TP_LocationName		ezTP_LocationName
+#define TP_ParseFunChars	ezTP_ParseFunChars
+#define Sbar_ColorForMap	ezSbar_ColorForMap
+#define scr_vrect			ezscr_vrect
+#define sb_lines			ezsb_lines
+#define keydown				ezkeydown
+#define scr_con_current		ezscr_con_current
+
 
 #undef mpic_t
 #define mpic_t void
@@ -130,8 +153,12 @@ mpic_t *Draw_CacheWadPic(const char *name);
 
 int Sbar_TopColor(player_info_t *pi);
 int Sbar_BottomColor(player_info_t *pi);
-char *TP_ParseFunChars(char*, qbool chat);
+char *TP_ParseFunChars(char*);
 char *TP_ItemName(unsigned int itbit);
+char*		TP_LocationName (const vec3_t location);
+
+char *Cmd_Argv(int arg);
+extern float           scr_con_current;	//current console lines shown
 
 #define Util_SkipChars(src,strip,dst,dstlen) strlcpy(dst,src,dstlen)
 #define Util_SkipEZColors(src,dst,dstlen) strlcpy(dst,src,dstlen)
@@ -158,12 +185,12 @@ typedef struct
 	qbyte c[4];
 } clrinfo_t;
 void Draw_ColoredString3(float x, float y, const char *str, clrinfo_t *clr, int huh, int wut);
-void UI_PrintTextBlock();
+void UI_PrintTextBlock(float x, float y, float w, float h, char *str, int flags);
 void Draw_AlphaRectangleRGB(int x, int y, int w, int h, int foo, int bar, byte r, byte g, byte b, byte a);
 void Draw_AlphaLineRGB(float x1, float y1, float x2, float y2, float width, byte r, byte g, byte b, byte a);
 void Draw_Polygon(int x, int y, vec3_t *vertices, int num_vertices, qbool fill, byte r, byte g, byte b, byte a);
 
-#undef sb_lines	//just in case.
+extern int			sb_lines;			// scan lines to draw
 #ifndef SBAR_HEIGHT
 #define SBAR_HEIGHT 24
 #define STAT_HEALTH			0
diff --git a/plugins/ezhud/hud.c b/plugins/ezhud/hud.c
index 1fe435303..89a8df4d1 100644
--- a/plugins/ezhud/hud.c
+++ b/plugins/ezhud/hud.c
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // HUD commands
 //
 
-#include "../plugin.h"
 #include "ezquakeisms.h"
 //#include "common_draw.h"
 //#include "keys.h"
diff --git a/plugins/ezhud/hud_common.c b/plugins/ezhud/hud_common.c
index 875e70e78..ea7b42490 100644
--- a/plugins/ezhud/hud_common.c
+++ b/plugins/ezhud/hud_common.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // like clock etc..
 //
 
-#include "../plugin.h"
+#include "ezquakeisms.h"
 /*
 #include "common_draw.h"
 #include "mp3_player.h"
@@ -39,7 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "teamplay.h"
 #include "mvd_utils.h"
 */
-#include "ezquakeisms.h"
 #include "hud.h"
 
 //#define WITH_PNG	//more WITH_RADAR than anything else.
@@ -5665,10 +5664,10 @@ static void SCR_HUD_DrawTeamInfo(hud_t *hud)
 	for ( maxloc = maxname = i = 0; i < slots_num; i++ ) {
 		// dynamically guess max length of name/location
 		nick = (ti_clients[i].nick[0] ? ti_clients[i].nick : cl.players[i].name); // we use nick or name
-		maxname = max(maxname, strlen(TP_ParseFunChars(nick, false)));
+		maxname = max(maxname, strlen(TP_ParseFunChars(nick)));
 
 		strlcpy(tmp, TP_LocationName(ti_clients[i].org), sizeof(tmp));
-		maxloc  = max(maxloc,  strlen(TP_ParseFunChars(tmp,  false)));
+		maxloc  = max(maxloc,  strlen(TP_ParseFunChars(tmp)));
 	}
 
 	// well, better use fixed loc length
@@ -5702,7 +5701,7 @@ static void SCR_HUD_DrawTeamInfo(hud_t *hud)
 		while (sorted_teams[k].name)
 		{
 			Draw_SString (x, _y, sorted_teams[k].name, hud_teaminfo_scale->value);
-			sprintf(tmp,"%s %i",TP_ParseFunChars("$.",false), sorted_teams[k].frags);
+			sprintf(tmp,"%s %i",TP_ParseFunChars("$."), sorted_teams[k].frags);
 			Draw_SString (x+(strlen(sorted_teams[k].name)+1)*FONTWIDTH, _y, tmp, hud_teaminfo_scale->value);
 			_y += FONTWIDTH * hud_teaminfo_scale->value;
 			for ( j = 0; j < slots_num; j++ ) 
@@ -5793,7 +5792,7 @@ static int SCR_HudDrawTeamInfoPlayer(teamplayerinfo_t *ti_cl, int x, int y, int
 
 	// this limit len of string because TP_ParseFunChars() do not check overflow
 	strlcpy(tmp2, HUD_FindVar(hud, "layout")->string , sizeof(tmp2));
-	strlcpy(tmp2, TP_ParseFunChars(tmp2, false), sizeof(tmp2));
+	strlcpy(tmp2, TP_ParseFunChars(tmp2), sizeof(tmp2));
 	s = tmp2;
 
 	//
@@ -5810,7 +5809,7 @@ static int SCR_HudDrawTeamInfoPlayer(teamplayerinfo_t *ti_cl, int x, int y, int
 			case 'n': // draw name
 
 				if(!width_only) {
-					char *nick = TP_ParseFunChars(ti_cl->nick[0] ? ti_cl->nick : cl.players[i].name, false);
+					char *nick = TP_ParseFunChars(ti_cl->nick[0] ? ti_cl->nick : cl.players[i].name);
 					str_align_right(tmp, sizeof(tmp), nick, maxname);
 					Draw_SString (x, y, tmp, scale);
 				}
@@ -5936,7 +5935,7 @@ static int SCR_HudDrawTeamInfoPlayer(teamplayerinfo_t *ti_cl, int x, int y, int
 					if (!loc[0])
 						loc = "unknown";
 
-					str_align_right(tmp, sizeof(tmp), TP_ParseFunChars(loc, false), maxloc);
+					str_align_right(tmp, sizeof(tmp), TP_ParseFunChars(loc), maxloc);
 					Draw_SString (x, y, tmp, scale);
 				}
 				x += maxloc * FONTWIDTH * scale;
@@ -6357,7 +6356,7 @@ void SCR_HUD_DrawScoresBar(hud_t *hud)
 	{
 		// Big
 		case 1:
-			in = TP_ParseFunChars(format_big->string, false);
+			in = TP_ParseFunChars(format_big->string);
 			buf[0] = 0;
 			out = buf;
 
@@ -6443,7 +6442,7 @@ void SCR_HUD_DrawScoresBar(hud_t *hud)
 		// Small
 		case 0:	
 		default:
-			in = TP_ParseFunChars(format_small->string, false);
+			in = TP_ParseFunChars(format_small->string);
 			buf[0] = 0;
 			out = buf;
 
diff --git a/plugins/ezhud/hud_editor.c b/plugins/ezhud/hud_editor.c
index 58322e9aa..7546dd16d 100644
--- a/plugins/ezhud/hud_editor.c
+++ b/plugins/ezhud/hud_editor.c
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	Initial concept code jogihoogi, rewritten by Cokeman, Feb 2007
 */
 
-#include "../plugin.h"
 #include "ezquakeisms.h"
 
 //#include "qsound.h"
diff --git a/plugins/hl2/fs_vpk.c b/plugins/hl2/fs_vpk.c
index a7d753db0..5bf5af05d 100644
--- a/plugins/hl2/fs_vpk.c
+++ b/plugins/hl2/fs_vpk.c
@@ -186,7 +186,7 @@ static int QDECL FSVPK_EnumerateFiles (searchpathfuncs_t *handle, const char *ma
 	return true;
 }
 
-static int QDECL FSVPK_GeneratePureCRC(searchpathfuncs_t *handle, int seed, int crctype)
+static int QDECL FSVPK_GeneratePureCRC(searchpathfuncs_t *handle, const int *seed)
 {
 	vpk_t *pak = (void*)handle;
 
diff --git a/plugins/hl2/mod_hl2.c b/plugins/hl2/mod_hl2.c
index 4dd1923ad..dd0090b55 100644
--- a/plugins/hl2/mod_hl2.c
+++ b/plugins/hl2/mod_hl2.c
@@ -45,30 +45,110 @@ typedef struct
 	vec3_t _128;
 	vec3_t _140;
 	unsigned int _152;
-	unsigned int _156;
-	unsigned int _160;
+	unsigned int num_bones;
+	unsigned int ofs_bones;		//hl2mdlbone_t
 	unsigned int _164;
 	unsigned int _168;
 	unsigned int _172;
 	unsigned int _176;
-	unsigned int _180;
-	unsigned int _184;
+	unsigned int num_anims;
+	unsigned int ofs_anims;		//hl2mdlanim_t
 	unsigned int _188;
 	unsigned int _192;
 	unsigned int _196;
 	unsigned int _200;
 	unsigned int tex_count;
-	unsigned int tex_ofs;
+	unsigned int tex_ofs;		//hl2mdltexture_t
 	unsigned int texpath_count;
-	unsigned int texpath_ofs;
+	unsigned int texpath_ofs;	//hl2mdltexturepath_t
 	unsigned int texbind_count;	//N slots per skin
 	unsigned int skin_count;
 	unsigned int texbind_offset;//provides skin|slot->texture mappings
 	unsigned int body_count;
-	unsigned int body_ofs;
+	unsigned int body_ofs;		//hl2mdlbody_t
+	unsigned int _240;
+	unsigned int _244;
+	unsigned int _248;
+	unsigned int _252;
+	unsigned int _256;
+	unsigned int _260;
+	unsigned int _264;
+	unsigned int _268;
+	unsigned int _272;
+	unsigned int _276;
+	unsigned int _280;
+	unsigned int _284;
+	unsigned int _288;
+	unsigned int _292;
+	unsigned int _296;
+	unsigned int _300;
+	unsigned int _304;
+	unsigned int _308;
+	unsigned int _312;
+	unsigned int _316;
+	unsigned int _320;
+	unsigned int _324;
+	unsigned int _328;
+	unsigned int _332;
+	unsigned int _336;
+	unsigned int _340;
+	unsigned int _344;
+	unsigned int ofs_aniname;	//348
+	unsigned int num_aniblocks;
+	unsigned int ofs_aniblocks;
 	//other stuff?
 } hl2mdlheader_t;
 typedef struct
+{
+	unsigned int name_ofs;
+	int parent;
+	int junk[6];
+	vec3_t pos;
+	float quat[4];
+	vec3_t rot;
+	vec3_t posscale;
+	vec3_t rotscale;
+	float inverse[12];
+	int junk3[18];
+} hl2mdlbone_t;
+typedef struct
+{
+	qbyte bone;		//skip ones in their base pose.
+	qbyte flags;	//says what the data is
+	short next;		//to walk the list when its variable sized...
+	unsigned short data[1];
+} hl2mdlpose_t;
+typedef struct
+{
+	unsigned int _0;
+	unsigned int name_ofs;
+	float fps;
+	unsigned int _12;
+	unsigned int numframes;
+	unsigned int _20;
+	unsigned int _24;
+	unsigned int _28;
+	unsigned int _32;
+	unsigned int _36;
+	unsigned int _40;
+	unsigned int _44;
+	unsigned int _48;
+	struct poseofs_s{
+		unsigned int externalblock;
+		unsigned int ofs_pose;	//hl2mdlpose_t
+	} defpose;
+	unsigned int _60;
+	unsigned int _64;
+	unsigned int _68;
+	unsigned int _72;
+	unsigned int _76;
+	unsigned int ofs_posesections;	//{block, ofs}
+	unsigned int posespersection;	//0 if its small enough to avoid the extra indirection.
+	unsigned int _88;
+	unsigned int _92;
+	unsigned int _96;
+} hl2mdlanim_t;
+typedef struct
 {
 	unsigned int name_ofs;
 	unsigned int surf_count;
@@ -266,6 +346,15 @@ typedef struct
 typedef struct
 {
 	model_t *mod;
+	hl2mdlheader_t *header;
+	void *ani;
+
+	float *basepose;
+	float *baserelpose;
+	galiasbone_t *bones;
+
+	unsigned int num_animations;
+	galiasanimation_t *ofs_animations;
 
 	unsigned numverts;
 	vec2_t *ofs_st_array;
@@ -273,8 +362,8 @@ typedef struct
 	vec3_t *ofs_skel_norm;
 	vec3_t *ofs_skel_svect;
 	vec3_t *ofs_skel_tvect;
-//	byte_vec4_t *ofs_skel_idx;
-//	vec4_t *ofs_skel_weight;
+	byte_vec4_t *ofs_skel_idx;
+	vec4_t *ofs_skel_weight;
 	struct
 	{
 		unsigned int numfixups;
@@ -282,7 +371,7 @@ typedef struct
 	} lod[1];	//must remain at 1 (instead of 8) until fixups are handled.
 } hl2parsecontext_t;
 
-static index_t *Mod_HL2_LoadIndexes(hl2parsecontext_t *ctx, unsigned int *idxcount, const hl2vtxmesh_t *vmesh, unsigned int lod, index_t firstindex)
+static index_t *Mod_HL2_LoadIndexes(hl2parsecontext_t *ctx, unsigned int *idxcount, const hl2vtxmesh_t *vmesh, unsigned int lod, index_t firstindex, index_t bias)
 {
 	size_t numidx = 0, g;
 	const hl2vtxstripg_t *vg;
@@ -314,7 +403,7 @@ static index_t *Mod_HL2_LoadIndexes(hl2parsecontext_t *ctx, unsigned int *idxcou
 			{
 				if (in == e)
 					break;
-				*idx++ = fixup[v[*in++].vert+firstindex];
+				*idx++ = fixup[v[*in++].vert+firstindex] - bias;
 			}
 		}
 		else
@@ -323,15 +412,16 @@ static index_t *Mod_HL2_LoadIndexes(hl2parsecontext_t *ctx, unsigned int *idxcou
 			{
 				if (in == e)
 					break;
-				*idx++ = v[*in++].vert+firstindex;
+				*idx++ = v[*in++].vert+firstindex - bias;
 			}
 		}
 	}
 	*idxcount = idx-ret;
 	return ret;
 }
-static qboolean Mod_HL2_LoadVTX(hl2parsecontext_t *ctx, const void *buffer, size_t fsize, unsigned int rev, const hl2mdlheader_t *mdl)
+static qboolean Mod_HL2_LoadVTX(hl2parsecontext_t *ctx, const void *buffer, size_t fsize)
 {	//horribly overcomplicated way to express this stuff.
+	const hl2mdlheader_t *mdl = ctx->header;
 	size_t totalsurfs = 0, b, s, l, m, t;
 	const hl2vtxheader_t *header = buffer;
 	const hl2vtxbody_t *vbody;
@@ -350,7 +440,7 @@ static qboolean Mod_HL2_LoadVTX(hl2parsecontext_t *ctx, const void *buffer, size
 	skinframe_t *skinframe;
 	size_t firstvert = 0;
 
-	if (fsize < sizeof(*header) || header->version != 7 || header->revisionid != rev || header->body_count == 0)
+	if (fsize < sizeof(*header) || header->version != 7 || header->revisionid != ctx->header->revisionid || header->body_count == 0)
 		return false;
 
 	vbody = (const void*)((const qbyte*)header + header->body_ofs);
@@ -418,11 +508,13 @@ static qboolean Mod_HL2_LoadVTX(hl2parsecontext_t *ctx, const void *buffer, size
 					Q_snprintfz(surf->surfacename, sizeof(surf->surfacename), "%s:%s:l%u:m%u", (const char*)mbody+mbody->name_ofs, msurf->name, (unsigned)l, (unsigned)m);
 
 					/*animation info*/
-					surf->shares_bones = 0;
-					surf->numbones = 0;
-					surf->ofsbones = NULL;		//no support for animations...
-					surf->numanimations = 0;
-					surf->ofsanimations = NULL;	//we have no animation data
+					surf->numanimations = ctx->num_animations;
+					surf->ofsanimations = ctx->ofs_animations;	//we have no animation data
+
+					surf->baseframeofs = ctx->basepose;
+					surf->ofsbones = ctx->bones;
+					surf->numbones = mdl->num_bones;
+					surf->shares_bones = 0;	//all the same id
 
 					#ifndef SERVERONLY
 					/*skin data*/
@@ -440,22 +532,37 @@ static qboolean Mod_HL2_LoadVTX(hl2parsecontext_t *ctx, const void *buffer, size
 					surf->ofs_skel_norm = ctx->ofs_skel_norm;
 					surf->ofs_skel_svect = ctx->ofs_skel_svect;
 					surf->ofs_skel_tvect = ctx->ofs_skel_tvect;
-					//surf->ofs_skel_idx = ctx->ofs_skel_idx;
-					//surf->ofs_skel_weight = ctx->ofs_skel_weight;
+					surf->ofs_skel_idx = ctx->ofs_skel_idx;
+					surf->ofs_skel_weight = ctx->ofs_skel_weight;
 
 					/*index data*/
 					if (mmesh->vert_first+mmesh->vert_count > surf->numverts)
 						surf->ofs_indexes = NULL, surf->numindexes = 0;	//erk?
+					else if (!ctx->lod[l].numfixups /*&& mdl->num_bones > sh_config.max_gpu_bones*/)
+					{	//FIXME: fixups make this too screwy, so we can't use this path when they're in use, which means we will probably exceed out gpu bones limit more than we otherwise would (just a perf issue)
+						unsigned int bias = firstvert+mmesh->vert_first;
+						surf->numverts = mmesh->vert_count;
+						surf->ofs_st_array += bias;
+						surf->ofs_skel_xyz += bias;
+						surf->ofs_skel_norm += bias;
+						surf->ofs_skel_svect += bias;
+						surf->ofs_skel_tvect += bias;
+						surf->ofs_skel_idx += bias;
+						surf->ofs_skel_weight += bias;
+						surf->shares_verts = surf-(galiasinfo_t*)ctx->mod->meshinfo;
+
+						surf->ofs_indexes = Mod_HL2_LoadIndexes(ctx, &surf->numindexes, vmesh, l, bias, bias);
+					}
 					else
-						surf->ofs_indexes = Mod_HL2_LoadIndexes(ctx, &surf->numindexes, vmesh, l, firstvert+mmesh->vert_first);
+						surf->ofs_indexes = Mod_HL2_LoadIndexes(ctx, &surf->numindexes, vmesh, l, firstvert+mmesh->vert_first, 0);
 
 					/*misc data*/
 					surf->geomset = 0;
 					surf->geomid = 0;
 					surf->contents = FTECONTENTS_BODY;
 					surf->csurface.flags = 0;
-					surf->surfaceid = 0;
-					surf->mindist = 0;
+					surf->surfaceid = b;
+					surf->mindist = 0;	/*fixme: lods*/
 					surf->maxdist = 0;
 
 					if (surf != ctx->mod->meshinfo)
@@ -479,13 +586,13 @@ void CrossProduct (const vec3_t v1, const vec3_t v2, vec3_t cross)
 	cross[1] = v1[2]*v2[0] - v1[0]*v2[2];
 	cross[2] = v1[0]*v2[1] - v1[1]*v2[0];
 }
-static qboolean Mod_HL2_LoadVVD(hl2parsecontext_t *ctx, const void *buffer, size_t fsize, unsigned int rev)
+static qboolean Mod_HL2_LoadVVD(hl2parsecontext_t *ctx, const void *buffer, size_t fsize)
 {
 	const hl2vvdheader_t *header = buffer;
 	size_t lod;
 	const hl2vvdvert_t *in;
 	const vec4_t *it;
-	if (fsize < sizeof(*header) || header->magic != (('I'<<0)|('D'<<8)|('S'<<16)|('V'<<24)) || header->version != 4 || header->revisionid != rev || header->lodverts_count[0] == 0)
+	if (fsize < sizeof(*header) || header->magic != (('I'<<0)|('D'<<8)|('S'<<16)|('V'<<24)) || header->version != 4 || header->revisionid != ctx->header->revisionid || header->lodverts_count[0] == 0)
 		return false;
 
 	{
@@ -495,8 +602,8 @@ static qboolean Mod_HL2_LoadVVD(hl2parsecontext_t *ctx, const void *buffer, size
 		vec3_t *norm = ctx->ofs_skel_norm	= plugfuncs->GMalloc(&ctx->mod->memgroup, sizeof(*norm)*numverts);
 		vec3_t *sdir = ctx->ofs_skel_svect	= plugfuncs->GMalloc(&ctx->mod->memgroup, sizeof(*sdir)*numverts);
 		vec3_t *tdir = ctx->ofs_skel_tvect	= plugfuncs->GMalloc(&ctx->mod->memgroup, sizeof(*tdir)*numverts);
-//		byte_vec4_t *bone = ctx->lod[lod].ofs_skel_idx = plugfuncs->GMalloc(&ctx->mod->memgroup, sizeof(*bone)*numverts);
-//		vec4_t *weight = ctx->lod[lod].ofs_skel_weight = plugfuncs->GMalloc(&ctx->mod->memgroup, sizeof(*weight)*numverts);
+		byte_vec4_t *bone = ctx->ofs_skel_idx = plugfuncs->GMalloc(&ctx->mod->memgroup, sizeof(*bone)*numverts);
+		vec4_t *weight = ctx->ofs_skel_weight = plugfuncs->GMalloc(&ctx->mod->memgroup, sizeof(*weight)*numverts);
 
 		in = (const void*)((const char*)buffer+header->verts_offset);
 		it = (const void*)((const char*)buffer+header->tangents_offset);
@@ -506,10 +613,10 @@ static qboolean Mod_HL2_LoadVVD(hl2parsecontext_t *ctx, const void *buffer, size
 			VectorCopy(in->xyz, xyz[v]);
 			VectorCopy(in->norm, norm[v]);
 
-//			VectorCopy(in->bone, bone[v]);
-//			bone[v][3] = bone[v][2];	//make sure its valid, and in cache.
-//			VectorCopy(in->weight, weight[v]);
-//			weight[v][3] = 0;			//missing influences cannot influence.
+			VectorCopy(in->bone, bone[v]);
+			bone[v][3] = bone[v][2];	//make sure its valid, and in cache.
+			VectorCopy(in->weight, weight[v]);
+			weight[v][3] = 0;			//missing influences cannot influence.
 
 			//tangents are compacted, and for some reason in a different part of the file.
 			VectorCopy((*it), sdir[v]);
@@ -544,15 +651,190 @@ static qboolean Mod_HL2_LoadVVD(hl2parsecontext_t *ctx, const void *buffer, size
 	}
 	return true;
 }
+
+static void Angle2Quaternion(const vec3_t angles, vec4_t quaternion)
+{
+	float	yaw = angles[2] * 0.5;
+	float	pitch = angles[1] * 0.5;
+	float	roll = angles[0] * 0.5;
+	float	siny = sin(yaw);
+	float	cosy = cos(yaw);
+	float	sinp = sin(pitch);
+	float	cosp = cos(pitch);
+	float	sinr = sin(roll);
+	float	cosr = cos(roll);
+
+	quaternion[0] = sinr * cosp * cosy - cosr * sinp * siny;
+	quaternion[1] = cosr * sinp * cosy + sinr * cosp * siny;
+	quaternion[2] = cosr * cosp * siny - sinr * sinp * cosy;
+	quaternion[3] = cosr * cosp * cosy + sinr * sinp * siny;
+}
+static signed short Mod_HL2_ReadAnimValue(const void *baseptr, signed short offset, int posenum)
+{
+	const hlmdl_animvalue_t	*animvalue = (const hlmdl_animvalue_t *) ((const qbyte *) baseptr + offset);
+	if (!offset)
+		return 0;	//nope, axis not present.
+	/* find values including the required frame */
+	while(animvalue->num.total <= posenum)
+	{
+		posenum -= animvalue->num.total;
+		animvalue += animvalue->num.valid + 1;
+	}
+	if (posenum >= animvalue->num.valid)
+		posenum = animvalue->num.valid;
+	else
+		posenum += 1;
+	return animvalue[posenum].value;
+}
+static const void *Mod_HL2_GetExternalBlock(hl2parsecontext_t *ctx, const void *base, int blockidx, int offset)
+{
+	if (!blockidx)
+	{	//data is relative to the parent structure...
+		return (const qbyte*)base + offset;
+	}
+	else
+	{	//data is elsewhere...
+		const struct {
+			int start;
+			int end;
+		} *block = (const void*)((const qbyte*)ctx->header + ctx->header->ofs_aniblocks);
+		block += blockidx;
+
+		if (!ctx->ani)
+		{
+			vfsfile_t *f = filefuncs->OpenVFS((const char *)ctx->header + ctx->header->ofs_aniname, "rb", FS_GAME);
+			if (f)
+			{
+				size_t sz = f->GetLen(f);
+				ctx->ani = plugfuncs->GMalloc(&ctx->mod->memgroup, sz);
+				f->ReadBytes(f, ctx->ani, sz);
+				f->Close(f);
+			}
+		}
+		if (ctx->ani)
+			return (const qbyte*)ctx->ani + block->start + offset;
+	}
+	return NULL;
+}
+
+static float HalfToFloat(unsigned short val)
+{	//hl2 supported shitty low-ram consoles. yay for data compression?
+	union
+	{
+		float f;
+		unsigned int u;
+	} u;
+	if (val&0x7c00)
+		u.u = (((val&0x7c00)>>10)-15+127)<<23;	//read exponent, rebias it, and reshift.
+	else
+		u.u = 0;	//denormal (or 0).
+	u.u |= ((val & 0x3ff)<<13);//shift up the mantissa, but don't fold
+	u.u |= (val&0x8000)<<16;	//retain the sign bit.
+	return u.f;
+}
+static void Mod_HL2_ReadPose(hl2parsecontext_t *ctx, const hl2mdlanim_t *anim, int posenum, matrix3x4 *out, unsigned int numbones, const hl2mdlbone_t *boneinfo)
+{	//hl2 models seem to have both animations and sequences
+	vec3_t org;
+	vec4_t quat;
+	static vec3_t scale={1,1,1};
+	const unsigned short *data;
+	const hl2mdlpose_t *pose;
+	struct poseofs_s poseofs = anim->defpose;
+	int sect = 0;
+	if (anim->posespersection)
+	{	//can be stored in groups, so we don't have to walk as many rle entries.
+		sect = posenum/anim->posespersection;
+		poseofs = ((const struct poseofs_s*)((const qbyte*)anim + anim->ofs_posesections))[sect];
+		posenum -= sect * anim->posespersection;
+	}
+
+	memcpy(out, ctx->baserelpose, sizeof(*out)*numbones);
+	pose = Mod_HL2_GetExternalBlock(ctx, anim, poseofs.externalblock, poseofs.ofs_pose);
+	if (!pose || pose->bone==255)
+		return;
+	for (;;)
+	{
+		data = pose->data;
+
+		if (pose->flags & 0x2)
+		{	//static data shared between all frames in this cluster
+			quat[0] = ((int)(data[0]       )-0x8000) / (float)0x8000;
+			quat[1] = ((int)(data[1]       )-0x8000) / (float)0x8000;
+			quat[2] = ((int)(data[2]&0x7fff)-0x4000) / (float)0x4000;
+			quat[3] = 1 - DotProduct(quat, quat);
+			quat[3] = sqrt(quat[3]);
+			if (data[2]&0x8000)
+				quat[3] *= -1;
+			data+=3;
+		}
+		else if (pose->flags & 0x20)
+		{	//apparently these are 21+21+21+1 bits each
+			quint64_t q64 = *(const quint64_t*)data;
+			quat[0] = (((int)(q64>> 0)&((1<<21)-1))-(1<<20)) / (float)(1<<20);
+			quat[1] = (((int)(q64>>21)&((1<<21)-1))-(1<<20)) / (float)(1<<20);
+			quat[2] = (((int)(q64>>42)&((1<<21)-1))-(1<<20)) / (float)(1<<20);
+			quat[3] = 1 - DotProduct(quat, quat);
+			quat[3] = sqrt(quat[3]);
+			if (q64&(((quint64_t)1)<<63))
+				quat[3] *= -1;
+			data+=sizeof(q64)/sizeof(*data);
+		}
+		else if (pose->flags & 0x8)
+		{	//animated version (using some sort of RLE)
+			vec3_t ang;
+			if (pose->flags & 0x10)
+				VectorClear(ang);
+			else
+				VectorCopy(boneinfo[pose->bone].rot, ang);
+			ang[0] += Mod_HL2_ReadAnimValue(data, data[0], posenum) * boneinfo[pose->bone].rotscale[0];
+			ang[1] += Mod_HL2_ReadAnimValue(data, data[1], posenum) * boneinfo[pose->bone].rotscale[1];
+			ang[2] += Mod_HL2_ReadAnimValue(data, data[2], posenum) * boneinfo[pose->bone].rotscale[2];
+			data+=3;
+			Angle2Quaternion(ang, quat);
+		}
+		else if (pose->flags & 0x10)
+			Vector4Set(quat, 0, 0, 0, 1);
+		else
+			VectorCopy(boneinfo[pose->bone].quat, quat);
+
+		if (pose->flags & 1)
+		{	//static data
+			org[0] = HalfToFloat(data[0]);
+			org[1] = HalfToFloat(data[1]);
+			org[2] = HalfToFloat(data[2]);
+			data+=3;
+		}
+		else
+		{
+			if (pose->flags & 0x10)
+				VectorClear(org);
+			else
+				VectorCopy(boneinfo[pose->bone].pos, org);
+			if (pose->flags & 0x4)
+			{	//animated version (using some sort of RLE)
+				org[0] += Mod_HL2_ReadAnimValue(data, data[0], posenum) * boneinfo[pose->bone].posscale[0];
+				org[1] += Mod_HL2_ReadAnimValue(data, data[1], posenum) * boneinfo[pose->bone].posscale[1];
+				org[2] += Mod_HL2_ReadAnimValue(data, data[2], posenum) * boneinfo[pose->bone].posscale[2];
+				data+=3;
+			}
+		}
+
+		//FIXME: bone controllers
+
+		modfuncs->GenMatrixPosQuat4Scale(org, quat, scale, (float*)(out + pose->bone));
+		if (!pose->next)
+			break;
+		pose = (const hl2mdlpose_t*)((const qbyte*)pose + pose->next);
+	}
+}
 qboolean QDECL Mod_LoadHL2Model (model_t *mod, void *buffer, size_t fsize)
 {
-	hl2parsecontext_t ctx = {mod};
-	const hl2mdlheader_t *header = buffer;
+	hl2parsecontext_t ctx = {mod, buffer};
 	void *vtx = NULL, *vvd = NULL;
 	size_t vtxsize = 0, vvdsize = 0;
 	char base[MAX_QPATH];
 	qboolean result;
-	size_t i;
+	size_t i, p;
 	const char *vtxpostfixes[] = {
 		".dx90.vtx",
 		".dx80.vtx",
@@ -576,13 +858,76 @@ qboolean QDECL Mod_LoadHL2Model (model_t *mod, void *buffer, size_t fsize)
 		vvd = filefuncs->LoadFile(base, &vvdsize);
 	}
 
-	result  = Mod_HL2_LoadVVD(&ctx, vvd, vvdsize, header->revisionid);
-	result &= Mod_HL2_LoadVTX(&ctx, vtx, vtxsize, header->revisionid, header);
+	if (ctx.header->num_bones)
+	{
+		const hl2mdlbone_t *in = (const hl2mdlbone_t*)((const qbyte*)ctx.header + ctx.header->ofs_bones);
+		vec3_t scale = {1,1,1};
+		ctx.basepose = plugfuncs->GMalloc(&mod->memgroup, sizeof(float)*12*ctx.header->num_bones);
+		ctx.baserelpose = alloca(sizeof(float)*12*ctx.header->num_bones);
+		ctx.bones = plugfuncs->GMalloc(&mod->memgroup, sizeof(*ctx.bones)*ctx.header->num_bones);
+
+		for (i = 0; i < ctx.header->num_bones; i++)
+		{
+			float *pose = ctx.baserelpose + 12*i;
+			Q_strlcpy(ctx.bones[i].name, (const char*)&in[i]+in[i].name_ofs, sizeof(ctx.bones[i].name));
+			ctx.bones[i].parent = in[i].parent;
+			modfuncs->GenMatrixPosQuat4Scale(in[i].pos, in[i].quat, scale, pose);
+			if (in[i].parent>=0)
+				modfuncs->ConcatTransforms((const void*)(ctx.basepose+in[i].parent*12), (const void*)pose, (void*)(ctx.basepose+i*12));
+			else
+				memcpy(ctx.basepose+12*i, pose, sizeof(float)*12);
+			modfuncs->M3x4_Invert(ctx.basepose+12*i, ctx.bones[i].inverse);
+		}
+
+		if (ctx.header->num_anims)
+		{
+			galiasanimation_t *a;
+			const hl2mdlanim_t *in = (const hl2mdlanim_t*)((const qbyte*)ctx.header + ctx.header->ofs_anims);
+			a = ctx.ofs_animations = plugfuncs->GMalloc(&mod->memgroup, sizeof(*ctx.ofs_animations)*ctx.header->num_anims);
+			//note that hl2 models have anims and sequences... I'm guessing I ought to be exposing sequences instead of anims.
+			for (i = 0; i < ctx.header->num_anims; i++, in++)
+			{
+				a->skeltype = SKEL_RELATIVE;
+				a->numposes = in->numframes;
+
+				a->GetRawBones = NULL;	//FIXME: for delay loading the proper way...
+										//FIXME: replace Alias_FindRawSkelData instead, to handle bone controllers etc.
+				a->boneofs = plugfuncs->GMalloc(&mod->memgroup, sizeof(float)*a->numposes*12*ctx.header->num_bones);
+				a->loop = true;
+				a->rate = in->fps;
+				a->action = -1;
+				a->actionweight = 0;
+				a->events = NULL;
+				Q_strlcpy(a->name, (const char*)in + in->name_ofs, sizeof(a->name));
+
+				for (p = 0; p < a->numposes; p++)
+					Mod_HL2_ReadPose(&ctx, in, p, (matrix3x4*)a->boneofs+p*ctx.header->num_bones, ctx.header->num_bones, (const hl2mdlbone_t*)((const qbyte*)ctx.header + ctx.header->ofs_bones));
+				a++;
+			}
+			ctx.num_animations = a-ctx.ofs_animations;
+		}
+	}
+
+
+	result  = Mod_HL2_LoadVVD(&ctx, vvd, vvdsize);
+	result &= Mod_HL2_LoadVTX(&ctx, vtx, vtxsize);
 	plugfuncs->Free(vvd);
 	plugfuncs->Free(vtx);
 
-	VectorCopy(header->mins, mod->mins);
-	VectorCopy(header->maxs, mod->maxs);
+	if (ctx.header->num_bones && !mod->meshinfo)
+	{	//it has a rig... make sure we spit out a surface so we can read the bones.
+		galiasinfo_t *surf = mod->meshinfo = plugfuncs->GMalloc(&mod->memgroup, sizeof(galiasinfo_t));
+		surf->numbones = ctx.header->num_bones;
+		surf->baseframeofs = ctx.basepose;
+		surf->ofsbones = ctx.bones;
+
+		surf->numanimations = ctx.num_animations;
+		surf->ofsanimations = ctx.ofs_animations;
+		result = true;
+	}
+
+	VectorCopy(ctx.header->mins, mod->mins);
+	VectorCopy(ctx.header->maxs, mod->maxs);
 
 	mod->type = mod_alias;
 	mod->radius = RadiusFromBounds(mod->mins, mod->maxs);
@@ -594,7 +939,7 @@ qboolean MDL_Init(void)
 {
 	filefuncs = plugfuncs->GetEngineInterface(plugfsfuncs_name, sizeof(*filefuncs));
 	modfuncs = plugfuncs->GetEngineInterface(plugmodfuncs_name, sizeof(*modfuncs));
-	if (modfuncs && modfuncs->version < MODPLUGFUNCS_VERSION)
+	if (modfuncs && modfuncs->version != MODPLUGFUNCS_VERSION)
 		modfuncs = NULL;
 
 	if (modfuncs && filefuncs)
diff --git a/plugins/hl2/mod_vbsp.c b/plugins/hl2/mod_vbsp.c
index 903b66fe0..c8d1bd894 100644
--- a/plugins/hl2/mod_vbsp.c
+++ b/plugins/hl2/mod_vbsp.c
@@ -287,8 +287,6 @@ typedef struct dispinfo_s
         float alpha;
     } *verts;
     //unsigned short *flags;
-
-    q2csurface_t csurface;  //collision info for q2 gamecode.
 } dispinfo_t;
 
 typedef struct vbspinfo_s
@@ -4157,7 +4155,7 @@ qboolean VBSP_Init(void)
 {
 	filefuncs = plugfuncs->GetEngineInterface(plugfsfuncs_name, sizeof(*filefuncs));
 	modfuncs = plugfuncs->GetEngineInterface(plugmodfuncs_name, sizeof(*modfuncs));
-	if (modfuncs && modfuncs->version < MODPLUGFUNCS_VERSION)
+	if (modfuncs && modfuncs->version != MODPLUGFUNCS_VERSION)
 		modfuncs = NULL;
 	threadfuncs = plugfuncs->GetEngineInterface(plugthreadfuncs_name, sizeof(*threadfuncs));
 
diff --git a/plugins/models/gltf.c b/plugins/models/gltf.c
index 14f711742..0caaf6530 100644
--- a/plugins/models/gltf.c
+++ b/plugins/models/gltf.c
@@ -46,7 +46,6 @@
 //'The units for all linear distances are meters.'
 //'feh: 1 metre is approx. 26.24671916 qu.'
 //if the player is 1.6m tall, and the player's model is around 48qu, then 1m=30qu, which is a slightly nicer number to work with, and 1qu is a really poorly defined unit.
-#define MAX_MORPHWEIGHTS 16	//we're required to support up to 8 accessors (so mandatory max changes according to supplied data, so 8 morphs with just positions, 4 with positions+normals, or 2 with positions+normals+tangents - plus the base info)
 
 #ifdef GLTFMODELS
 static plugmodfuncs_t *modfuncs;
@@ -1954,7 +1953,7 @@ static void GLTF_GetIndiciesAccessor(gltf_prim_t *state, struct gltf_accessor *o
 	GLTF_GetAccessor(state->gltf, JSON_FindChild(state->prim, "indices"), out);
 }
 
-static const float *QDECL GLTF_AnimateMorphs(const galiasinfo_t *surf, const framestate_t *framestate);
+static const float *QDECL GLTF_AnimateMorphs(const galiasinfo_t *surf, const framestate_t *framestate, float *morphs);
 static qboolean GLTF_ProcessMesh(gltf_t *gltf, json_t *meshid, int basebone, double skinmatrix[])
 {
 	model_t *mod = gltf->mod;
@@ -1962,22 +1961,22 @@ static qboolean GLTF_ProcessMesh(gltf_t *gltf, json_t *meshid, int basebone, dou
 	json_t *mesh = GLTF_FindJSONID(gltf, "meshes", meshid, &meshidx);
 	json_t *primnode;
 	json_t *meshname = JSON_FindChild(mesh, "name");
-	json_t *target = NULL;
-	float	morphweights[MAX_MORPHWEIGHTS];
-	size_t morphtargets;
+	json_t *weights = NULL;
+	size_t morphtargets = 0;
 
-	target = JSON_FindChild(mesh, "weights");
-	for (morphtargets = 0; morphtargets < MAX_MORPHWEIGHTS; morphtargets++)
-		morphweights[morphtargets] = JSON_GetIndexedFloat(target, morphtargets, 0);
-	morphtargets = ~0;
+	weights = JSON_FindChild(mesh, "weights");
 	GLTF_FlagExtras(mesh);
 
 	for(primnode = JSON_FindIndexedChild(mesh, "primitives", 0); primnode; primnode = primnode->sibling)
 	{
 		int mode  = JSON_GetInteger(primnode, "mode", 4);
 		json_t *attr = JSON_FindChild(primnode, "attributes");
+		json_t *targets = JSON_FindChild(primnode, "targets");
 		struct gltf_accessor tc_0, tc_1, norm, tang, vpos, col0, idx, sidx, swgt;
-		struct gltf_accessor morph_vpos[MAX_MORPHWEIGHTS], morph_norm[MAX_MORPHWEIGHTS], morph_tang[MAX_MORPHWEIGHTS];
+		struct
+		{
+			struct gltf_accessor vpos, norm, tang;
+		} *morph = NULL;
 		galiasinfo_t *surf;
 		size_t i, j;
 		index_t maxvert;
@@ -1985,7 +1984,7 @@ static qboolean GLTF_ProcessMesh(gltf_t *gltf, json_t *meshid, int basebone, dou
 		gltf_prim_t prim = {gltf, primnode, attr};
 
 #ifdef HAVE_DRACO
- #define PRIMCLEANUP() do{if (prim.draco) prim.draco->Release(prim.draco);}while(0)		//frees memory allocations from inside this loop
+ #define PRIMCLEANUP() do{if (prim.draco) prim.draco->Release(prim.draco);  free(morph);}while(0)		//frees memory allocations from inside this loop
 		json_t *draconode = JSON_FindChild(primnode, "extensions.KHR_draco_mesh_compression");
 		if (draconode)
 		{	//decompress the ext.bufferview and replace matching primative.attributes[n] with any listed ext.attributes[n] entries, and the indicies
@@ -2007,7 +2006,7 @@ static qboolean GLTF_ProcessMesh(gltf_t *gltf, json_t *meshid, int basebone, dou
 			prim.dracoattrs = JSON_FindChild(draconode, "attributes");
 		}
 #else
- #define PRIMCLEANUP() do{}while(0)
+ #define PRIMCLEANUP() do{free(morph);}while(0)
 #endif
 
 		primnode->used = true;
@@ -2029,26 +2028,23 @@ static qboolean GLTF_ProcessMesh(gltf_t *gltf, json_t *meshid, int basebone, dou
 			continue;
 		}
 
-		for (i = 0; ; i++)
-		{
-			target = JSON_FindIndexedChild(primnode, "targets", i);
-			if (!target)
-				break;
-			GLTF_GetAccessor(gltf, JSON_FindChild(target, "POSITION"), &morph_vpos[i]);
-			GLTF_GetAccessor(gltf, JSON_FindChild(target, "NORMAL"), &morph_norm[i]);
-			GLTF_GetAccessor(gltf, JSON_FindChild(target, "TANGENT"), &morph_tang[i]);
-		}
+		i = JSON_GetCount(targets);
 		if (i != morphtargets)
 		{
-			if (morphtargets == ~0)
+			if (morphtargets == 0)
 				morphtargets = i;
 			else if (gltf->warnlimit --> 0)
 				Con_Printf(CON_WARNING"morphtargets count changed between primitives\n");
-			for (; i < morphtargets; i++)
+		}
+		if (morphtargets)
+		{
+			morph = malloc(sizeof(*morph) * morphtargets);
+			for (i = 0; i < morphtargets; i++)
 			{
-				memset(&morph_vpos[i], 0, sizeof(morph_vpos[i]));
-				memset(&morph_norm[i], 0, sizeof(morph_norm[i]));
-				memset(&morph_tang[i], 0, sizeof(morph_tang[i]));
+				json_t *target = JSON_GetIndexed(targets, i);
+				GLTF_GetAccessor(gltf, JSON_FindChild(target, "POSITION"), &morph[i].vpos);
+				GLTF_GetAccessor(gltf, JSON_FindChild(target, "NORMAL"), &morph[i].norm);
+				GLTF_GetAccessor(gltf, JSON_FindChild(target, "TANGENT"), &morph[i].tang);
 			}
 		}
 
@@ -2148,7 +2144,8 @@ static qboolean GLTF_ProcessMesh(gltf_t *gltf, json_t *meshid, int basebone, dou
 		}
 
 		surf->AnimateMorphs = GLTF_AnimateMorphs;
-		memcpy((float*)(surf+1), morphweights, sizeof(float)*morphtargets);
+		for (i = 0; i < morphtargets; i++)
+			((float*)(surf+1))[i] = JSON_GetIndexedFloat(weights, i, 0);
 		surf->nummorphs = morphtargets;
 		surf->ofs_skel_xyz = plugfuncs->GMalloc(&mod->memgroup, (sizeof(*surf->ofs_skel_xyz)+sizeof(*surf->ofs_skel_norm)+sizeof(*surf->ofs_skel_svect)+sizeof(*surf->ofs_skel_tvect)) * surf->numverts * (1+morphtargets));
 		surf->ofs_skel_norm = (vec3_t*)(surf->ofs_skel_xyz+surf->numverts*(1+morphtargets));
@@ -2162,9 +2159,16 @@ static qboolean GLTF_ProcessMesh(gltf_t *gltf, json_t *meshid, int basebone, dou
 		for (i = 0; i < morphtargets; i++)
 		{
 			size_t offset = (i+1) * surf->numverts;
-			GLTF_AccessorToDataF(gltf, surf->numverts, countof(surf->ofs_skel_xyz[0]),	&morph_vpos[i], surf->ofs_skel_xyz+offset);
-			GLTF_AccessorToDataF(gltf, surf->numverts, countof(surf->ofs_skel_norm[0]),	&morph_norm[i], surf->ofs_skel_norm+offset);			//if no normals, normals should be flat (fragment shader or unwelding the verts...)
-			GLTF_AccessorToTangents(gltf, surf->ofs_skel_norm+offset, surf->numverts,   &morph_tang[i], surf->ofs_skel_svect+offset, surf->ofs_skel_tvect+offset);
+			/*json_t *tname = JSON_FindIndexedChild(mesh, "extras.targetNames", i);
+			if (tname)
+			{
+				size_t nsize = JSON_ReadBody(tname, NULL, 0)+1;
+				surf->morphname[i] = plugfuncs->GMalloc(&mod->memgroup, nsize);
+				JSON_ReadBody(tname, surf->morphname[i], nsize);
+			}*/
+			GLTF_AccessorToDataF(gltf, surf->numverts, countof(surf->ofs_skel_xyz[0]),	&morph[i].vpos, surf->ofs_skel_xyz+offset);
+			GLTF_AccessorToDataF(gltf, surf->numverts, countof(surf->ofs_skel_norm[0]),	&morph[i].norm, surf->ofs_skel_norm+offset);			//if no normals, normals should be flat (fragment shader or unwelding the verts...)
+			GLTF_AccessorToTangents(gltf, surf->ofs_skel_norm+offset, surf->numverts,   &morph[i].tang, surf->ofs_skel_svect+offset, surf->ofs_skel_tvect+offset);
 		}
 		surf->meshrootbone = basebone;	//needed for morph anims
 
@@ -2716,7 +2720,9 @@ static void LerpAnimData(const struct gltf_animsampler *samp, float time, float
 {
 	float t0, t1;
 	float w0, w1;
-	float v0[max(4,MAX_MORPHWEIGHTS)], v1[max(4,MAX_MORPHWEIGHTS)];
+//	float v0[elems], v1[elems];
+	float *v0 = alloca(sizeof(*v0)*elems);
+	float *v1 = alloca(sizeof(*v1)*elems);
 	int f0, f1, c;
 
 	const struct gltf_accessor *in = &samp->input;
@@ -2852,10 +2858,9 @@ struct galiasanimation_gltf_s
 		struct gltf_animsampler rot,scale,trans,morph;
 	} bone[1];
 };
-static const float *QDECL GLTF_AnimateMorphs(const galiasinfo_t *surf, const framestate_t *framestate)
+static const float *QDECL GLTF_AnimateMorphs(const galiasinfo_t *surf, const framestate_t *framestate, float *morphs)
 {
-	static float morphs[MAX_MORPHWEIGHTS];
-	float imorphs[MAX_MORPHWEIGHTS], *src;
+	float *imorphs = alloca(sizeof(*imorphs)*surf->nummorphs), *src;
 	size_t influence, m;
 	int bone = surf->meshrootbone;
 	const struct galiasanimation_gltf_s *a;
@@ -2887,7 +2892,7 @@ static const float *QDECL GLTF_AnimateMorphs(const galiasinfo_t *surf, const fra
 	}
 	return morphs;
 }
-static float *QDECL GLTF_AnimateBones(const galiasinfo_t *surf, const galiasanimation_t *anim, float time, float *bonematrix, int numbones)
+static float *QDECL GLTF_AnimateBones(const galiasinfo_t *surf, const galiasanimation_t *anim, float time, float *bonematrix, const struct galiasbone_s *boneinf, int numbones)
 {
 	const struct galiasbone_gltf_s *defbone = surf->ctx;
 	int j = 0, l;
@@ -2974,7 +2979,6 @@ static qboolean GLTF_LoadModel(struct model_s *mod, char *json, size_t jsonsize,
 		{NULL}
 	}, *extensions;
 	gltf_t gltf;
-	int pos=0;
 	quintptr_t j,k;
 	json_t *scene, *n, *anim, *var;
 	double rootmatrix[16];
@@ -2985,11 +2989,12 @@ static qboolean GLTF_LoadModel(struct model_s *mod, char *json, size_t jsonsize,
 	unsigned int numframegroups = 0;
 	float *baseframe;
 	struct galiasbone_gltf_s *gltfbone;
+	struct jsonparsectx_s jsparsectx = {json, jsonsize, 0};
 	memset(&gltf, 0, sizeof(gltf));
 	gltf.bonemap = malloc(sizeof(*gltf.bonemap)*MAX_BONES);
 	gltf.bones = malloc(sizeof(*gltf.bones)*MAX_BONES);
 	memset(gltf.bones, 0, sizeof(*gltf.bones)*MAX_BONES);
-	gltf.r = JSON_ParseNode(NULL, mod->name, NULL, json, &pos, jsonsize);
+	gltf.r = JSON_ParseNode(NULL, mod->name, NULL, &jsparsectx);
 	gltf.mod = mod;
 	gltf.buffers[0].data = buffer;
 	gltf.buffers[0].length = buffersize;
@@ -3034,6 +3039,8 @@ static qboolean GLTF_LoadModel(struct model_s *mod, char *json, size_t jsonsize,
 			}
 		}
 
+		mod->flags = JSON_GetInteger(gltf.r, "asset.extras.fte.modelflags", 0.0);
+
 		for(n = JSON_FindIndexedChild(gltf.r, "extensionsUsed", 0); n; n = n->sibling)
 		{	//must be a superset of the above.
 			char extname[256];
@@ -3310,8 +3317,8 @@ static qboolean GLTF_LoadModel(struct model_s *mod, char *json, size_t jsonsize,
 				fg = &framegroups[k];
 				a = fg->boneofs;
 
-				fg->GetRawBones(surf, fg, 0, first, gltf.numbones);
-				fg->GetRawBones(surf, fg, a->duration, last, gltf.numbones);	//should fall on an exact frame.
+				fg->GetRawBones(surf, fg, 0, first, NULL, gltf.numbones);
+				fg->GetRawBones(surf, fg, a->duration, last, NULL, gltf.numbones);	//should fall on an exact frame.
 				for (j = 0; j < 12*gltf.numbones; j++)
 					if (first[j] != last[j])
 						break;
@@ -3394,7 +3401,7 @@ qboolean Plug_GLTF_Init(void)
 {
 	filefuncs = plugfuncs->GetEngineInterface(plugfsfuncs_name, sizeof(*filefuncs));
 	modfuncs = plugfuncs->GetEngineInterface(plugmodfuncs_name, sizeof(*modfuncs));
-	if (modfuncs && modfuncs->version < MODPLUGFUNCS_VERSION)
+	if (modfuncs && modfuncs->version != MODPLUGFUNCS_VERSION)
 		modfuncs = NULL;
 	mod_gltf_scale = cvarfuncs->GetNVFDG("mod_gltf_scale", "30", CVAR_RENDERERLATCH, "This defines the number of units per metre, in order to correctly load standard-scale gltf models.", "GLTF Models");
 	mod_gltf_fixbuggyanims = cvarfuncs->GetNVFDG("mod_gltf_fixbuggyanims", "1", CVAR_RENDERERLATCH, "Work around buggy exporters by merging animations that affect only a single bone.", "GLTF Models");
diff --git a/plugins/models/models.c b/plugins/models/models.c
index 8cc727363..6219deaee 100644
--- a/plugins/models/models.c
+++ b/plugins/models/models.c
@@ -839,7 +839,7 @@ qboolean Plug_Init(void)
 {
 	filefuncs = plugfuncs->GetEngineInterface(plugfsfuncs_name, sizeof(*filefuncs));
 	modfuncs = plugfuncs->GetEngineInterface(plugmodfuncs_name, sizeof(*modfuncs));
-	if (modfuncs && modfuncs->version < MODPLUGFUNCS_VERSION)
+	if (modfuncs && modfuncs->version != MODPLUGFUNCS_VERSION)
 		modfuncs = NULL;
 
 	if (modfuncs && filefuncs)
diff --git a/plugins/mpq/fs_mpq.c b/plugins/mpq/fs_mpq.c
index be60a9956..88094caac 100644
--- a/plugins/mpq/fs_mpq.c
+++ b/plugins/mpq/fs_mpq.c
@@ -437,7 +437,7 @@ static void	MPQ_BuildHash(searchpathfuncs_t *handle, int depth, void (QDECL *Add
 	}
 }
 
-static int		MPQ_GeneratePureCRC (searchpathfuncs_t *handle, int seed, int usepure)
+static int		MPQ_GeneratePureCRC (searchpathfuncs_t *handle, const int *seed)
 {
 	return 0;
 }
diff --git a/plugins/net_ssl_openssl.c b/plugins/net_ssl_openssl.c
index 6c592c126..a30509109 100644
--- a/plugins/net_ssl_openssl.c
+++ b/plugins/net_ssl_openssl.c
@@ -1,3 +1,12 @@
+#ifndef FTEPLUGIN
+#include "quakedef.h"
+#define FTEENGINE	//we're getting statically linked. lucky us.
+#define FTEPLUGIN
+#define Plug_Init Plug_OpenSSL_Init
+
+#define Q_strlcpy Q_strncpyz
+#endif
+
 #include "plugin.h"
 #include "netinc.h"
 
@@ -1025,8 +1034,8 @@ returncert:
 			size_t blobsize = i2d_X509(cert, NULL);
 			qbyte *end = out;
 			if (blobsize <= outsize)
-				i2d_X509(cert, &end);
-			return end-(qbyte*)out;
+				return i2d_X509(cert, &end);
+			return -1;	//caller didn't pass a big enough buffer.
 		}
 		return -1;
 	case QCERT_PEERSUBJECT:
@@ -1046,22 +1055,27 @@ returncert:
 		}
 		return -1;
 	safedefault:
+	case QCERT_LOBBYSTATUS:		//for special-case lobby wrappers.
+	case QCERT_LOBBYSENDCHAT:	//to send chat via the stupid lobby instead of the game itself.
 		return -1;
 	}
 }
 static qboolean OSSL_GenTempCertificate(const char *subject, struct dtlslocalcred_s *cred)
 {
+	qbyte *ffs;
+#if OPENSSL_API_LEVEL >= 30000
+	EVP_PKEY *pkey = EVP_RSA_gen(4096);
+#else
 	EVP_PKEY*pkey = EVP_PKEY_new();
 	RSA		*rsa = RSA_new();
 	BIGNUM	*pkexponent = BN_new();
-	qbyte *ffs;
 	//The pseudo-random number generator must be seeded prior to calling RSA_generate_key_ex().
 	BN_set_word(pkexponent, RSA_F4);
 	RSA_generate_key_ex(rsa, 2048, pkexponent, NULL);
 	BN_free(pkexponent);
 
 	EVP_PKEY_assign_RSA(pkey, rsa);
-
+#endif
 	cred->keysize = i2d_PrivateKey(pkey, NULL);
 	cred->key = ffs = plugfuncs->Malloc(cred->keysize);
 	cred->keysize = i2d_PrivateKey(pkey, &ffs);
@@ -1190,7 +1204,7 @@ static qboolean OSSL_Init(void)
 }
 
 static enum hashvalidation_e OSSL_VerifyHash(const qbyte *hashdata, size_t hashsize, const qbyte *pubkeydata, size_t pubkeysize, const qbyte *signdata, size_t signsize)
-{
+{	//accepts either DER or PEM certs
 	int result = VH_UNSUPPORTED;
 	BIO *bio_pubkey = BIO_new_mem_buf(pubkeydata, pubkeysize);
 	if (bio_pubkey)
@@ -1201,14 +1215,17 @@ static enum hashvalidation_e OSSL_VerifyHash(const qbyte *hashdata, size_t hashs
 			EVP_PKEY *evp_pubkey = X509_get_pubkey(x509_pubkey);
 			if (evp_pubkey)
 			{
-				RSA *rsa_pubkey = EVP_PKEY_get1_RSA(evp_pubkey);
-				if (rsa_pubkey)
+				EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new(evp_pubkey, NULL);
+				if (ctx)
 				{
-					if (1 == RSA_verify(NID_sha512, hashdata, hashsize,	signdata, signsize, rsa_pubkey))
+					EVP_PKEY_verify_init(ctx);
+					EVP_PKEY_CTX_set_rsa_padding(ctx, RSA_PKCS1_PADDING);
+					EVP_PKEY_CTX_set_signature_md(ctx, EVP_sha512());
+					if (1 == EVP_PKEY_verify(ctx, signdata, signsize, hashdata, hashsize))
 						result = VH_CORRECT;
 					else
 						result = VH_INCORRECT;
-					RSA_free(rsa_pubkey);
+					EVP_PKEY_CTX_free(ctx);
 				}
 				EVP_PKEY_free(evp_pubkey);
 			}
@@ -1216,7 +1233,6 @@ static enum hashvalidation_e OSSL_VerifyHash(const qbyte *hashdata, size_t hashs
 		}
 		BIO_free(bio_pubkey);
 	}
-
 	return result;
 }
 
diff --git a/plugins/openxr.c b/plugins/openxr.c
index 76fa05b93..11d1354e7 100644
--- a/plugins/openxr.c
+++ b/plugins/openxr.c
@@ -166,6 +166,70 @@ static void XR_PoseToAngOrg(const XrPosef *pose, vec3_t ang, vec3_t org)
 	org[2]  =     METRES_TO_QUAKE(pose->position.z);
 #endif
 }
+static void XR_PoseToMat12(const XrPosef *pose, float *out)
+{
+	vec3_t angles, origin;
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+
+	XR_PoseToAngOrg(pose, angles, origin);
+
+	angle = angles[YAW] * (M_PI*2 / 360);
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[PITCH] * (M_PI*2 / 360);
+	sp = sin(angle);
+	cp = cos(angle);
+	angle = angles[ROLL] * (M_PI*2 / 360);
+	sr = sin(angle);
+	cr = cos(angle);
+
+	out[0] = cp*cy;
+	out[1] = (sr*sp*cy+cr*-sy);
+	out[2] = (cr*sp*cy+-sr*-sy);
+	out[3] = origin[0];
+
+	out[4] = cp*sy;
+	out[5] = (sr*sp*sy+cr*cy);
+	out[6] = (cr*sp*sy+-sr*cy);
+	out[7] = origin[1];
+
+	out[8] = -sp;
+	out[9] = sr*cp;
+	out[10] = cr*cp;
+	out[11] = origin[2];
+}
+
+static void XR_Matrix3x4_RM_FromAngles(const vec3_t angles, const vec3_t origin, float *out)
+{
+	float		angle;
+	float		sr, sp, sy, cr, cp, cy;
+
+	angle = angles[YAW] * (M_PI*2 / 360);
+	sy = sin(angle);
+	cy = cos(angle);
+	angle = angles[PITCH] * (M_PI*2 / 360);
+	sp = sin(angle);
+	cp = cos(angle);
+	angle = angles[ROLL] * (M_PI*2 / 360);
+	sr = sin(angle);
+	cr = cos(angle);
+
+	out[0] = cp*cy;
+	out[1] = (sr*sp*cy+cr*-sy);
+	out[2] = (cr*sp*cy+-sr*-sy);
+	out[3] = origin[0];
+
+	out[4] = cp*sy;
+	out[5] = (sr*sp*sy+cr*cy);
+	out[6] = (cr*sp*sy+-sr*cy);
+	out[7] = origin[1];
+
+	out[8] = -sp;
+	out[9] = sr*cp;
+	out[10] = cr*cp;
+	out[11] = origin[2];
+}
 
 enum actset_e
 {
@@ -190,6 +254,7 @@ static struct
 	void *bindinginfo;		//appropriate XrGraphicsBinding*KHR struct so we can restart sessions.
 
 //session state
+	qboolean fake;
 	XrSession session;		//driver context
 	XrSessionState state;
 	qboolean beginning;
@@ -361,7 +426,9 @@ static const char *XR_StringForResult(XrResult res)
 	case XR_ERROR_ACTIONSETS_ALREADY_ATTACHED: return "XR_ERROR_ACTIONSETS_ALREADY_ATTACHED";
 	case XR_ERROR_LOCALIZED_NAME_DUPLICATED: return "XR_ERROR_LOCALIZED_NAME_DUPLICATED";
 	case XR_ERROR_LOCALIZED_NAME_INVALID: return "XR_ERROR_LOCALIZED_NAME_INVALID";
-//	case XR_ERROR_RUNTIME_UNAVAILABLE: return "XR_ERROR_RUNTIME_UNAVAILABLE";
+#if XR_CURRENT_API_VERSION >= XR_MAKE_VERSION(1, 0, 16)
+	case XR_ERROR_RUNTIME_UNAVAILABLE: return "XR_ERROR_RUNTIME_UNAVAILABLE";
+#endif
 	default:
 		return va("XrResult %i", res);
 	}
@@ -402,6 +469,11 @@ static qboolean XR_PreInit(vrsetup_t *qreqs)
 		return false;	//nope, get lost.
 	if (!strncasecmp(xr_formfactor->string, "none", 4))
 		qreqs->vrplatform = VR_HEADLESS;
+	if (!strncasecmp(xr_formfactor->string, "fake", 4))
+	{
+		xr.fake = true;
+		return true;
+	}
 	switch(qreqs->vrplatform)
 	{
 #ifdef XR_MND_HEADLESS_EXTENSION_NAME
@@ -796,6 +868,9 @@ static qboolean XR_PreInit(vrsetup_t *qreqs)
 
 static qboolean XR_Init(vrsetup_t *qreqs, rendererstate_t *info)
 {
+	if (xr.fake)
+		return true;	//nothing to do here.
+
 	xr.srgb = info->srgb;
 	switch(qreqs->vrplatform)
 	{
@@ -1939,17 +2014,24 @@ static void XR_ProcessEvents(void)
 		}
 	}
 }
-static qboolean XR_SyncFrame(double *frametime)
+static unsigned int XR_SyncFrame(double *frametime)
 {
+	unsigned int ret = 0;
 	XrResult res;
 
+	if (xr.fake)
+	{
+		xr.time += SECONDS_TO_NANOSECONDS(*frametime);
+		return VRF_UIACTIVE;	//not syncing here. let the engine run at its normal rate
+	}
+
 	if (!xr.instance)
-		return false;
+		return 0;
 
 	if (xr.needrender)
 	{	//something screwed up.
 //		*frametime = 0;
-		return true;
+		return VRF_UIACTIVE;
 	}
 
 	if (!xr.session)
@@ -1957,7 +2039,7 @@ static qboolean XR_SyncFrame(double *frametime)
 		if (xr_enable->ival && !XR_Begin())
 		{
 			XR_Shutdown();
-			return false;
+			return 0;
 		}
 	}
 	else
@@ -2025,6 +2107,10 @@ static qboolean XR_SyncFrame(double *frametime)
 			Con_Printf("xrWaitFrame: %s\n", XR_StringForResult(res));
 			return false;
 		}
+		ret |= VRF_OVERRIDEFRAMETIME;
+		if (xr.framestate.shouldRender)
+			ret |= VRF_UIACTIVE;
+
 		time = xr.framestate.predictedDisplayTime;
 		if (xr.timeknown)
 		{
@@ -2041,9 +2127,9 @@ static qboolean XR_SyncFrame(double *frametime)
 	if (xr.session)
 		XR_UpdateInputs(xr.framestate.predictedDisplayTime);
 
-	return true;
+	return ret;
 }
-static qboolean XR_Render(void(*rendereye)(texid_t tex, vec4_t fovoverride, vec3_t angorg[2]))
+static qboolean XR_Render(void(*rendereye)(texid_t tex, const pxrect_t *viewport, const vec4_t fovoverride, const float projmatrix[16], const float eyematrix[12]))
 {
 	XrFrameEndInfo endframeinfo = {XR_TYPE_FRAME_END_INFO};
 	unsigned int u;
@@ -2053,6 +2139,44 @@ static qboolean XR_Render(void(*rendereye)(texid_t tex, vec4_t fovoverride, vec3
 	const XrCompositionLayerBaseHeader *projlist[] = {(XrCompositionLayerBaseHeader*)&proj};
 	XrCompositionLayerProjectionView projviews[MAX_VIEW_COUNT];
 
+	if (xr.fake)
+	{
+		static vec3_t newhax[3], oldhax[3];
+		static XrTime lastup;
+		vec3_t org, ang = {0, 0, 0};
+		float frac;
+		const float UPDATEFREQ=1.0;
+		float eyemat[12];
+
+		if ((xr.time - lastup) > SECONDS_TO_NANOSECONDS(UPDATEFREQ))
+		{
+			lastup = xr.time;
+			memcpy(oldhax, newhax, sizeof(oldhax));
+			newhax[0][0] = crandom()*10;
+			newhax[0][1] = crandom()*10;
+			newhax[0][2] = crandom()*10;
+			newhax[1][0] = crandom()*30;
+			newhax[1][1] = crandom()*30;
+			newhax[1][2] = crandom()*30;
+			newhax[2][0] = crandom()*30;
+			newhax[2][1] = crandom()*30;
+			newhax[2][2] = crandom()*30;
+		}
+		frac = NANOSECONDS_TO_SECONDS(xr.time - lastup)/UPDATEFREQ;
+
+		//randomly screw with these inputs. you'll have to handle the clicks separately. :(
+		VectorInterpolate(oldhax[0], frac, newhax[0], ang);
+		XR_Matrix3x4_RM_FromAngles(ang, org, eyemat);
+		inputfuncs->SetHandPosition("head", org, ang, NULL, NULL);
+		VectorInterpolate(oldhax[1], frac, newhax[1], ang);
+		inputfuncs->SetHandPosition("right", org, ang, NULL, NULL);
+		VectorInterpolate(oldhax[2], frac, newhax[2], ang);
+		inputfuncs->SetHandPosition("left", org, ang, NULL, NULL);
+
+		rendereye(NULL, NULL, NULL, NULL, eyemat);
+		return true;	//skip the main view.
+	}
+
 	if (!xr.instance)
 		return false;	//err... noooes!
 
@@ -2196,7 +2320,7 @@ static qboolean XR_Render(void(*rendereye)(texid_t tex, vec4_t fovoverride, vec3
 			vec4_t fovoverride;
 			XrSwapchainImageWaitInfo waitinfo = {XR_TYPE_SWAPCHAIN_IMAGE_WAIT_INFO};
 			unsigned int imgidx = 0;
-			vec3_t orientation[2];
+			float eyematrix[12];
 			res = xrAcquireSwapchainImage(xr.eye[u].swapchain, NULL, &imgidx);
 			if (XR_FAILED(res))
 				Con_Printf("xrAcquireSwapchainImage: %s\n", XR_StringForResult(res));
@@ -2207,7 +2331,7 @@ static qboolean XR_Render(void(*rendereye)(texid_t tex, vec4_t fovoverride, vec3
 			projviews[u].fov = eyeview[u].fov;
 			projviews[u].subImage = xr.eye[u].subimage;
 
-			XR_PoseToAngOrg(&eyeview[u].pose, orientation[0], orientation[1]);
+			XR_PoseToMat12(&eyeview[u].pose, eyematrix);
 
 			fovoverride[0] = eyeview[u].fov.angleLeft * (180/M_PI);
 			fovoverride[1] = eyeview[u].fov.angleRight * (180/M_PI);
@@ -2218,7 +2342,7 @@ static qboolean XR_Render(void(*rendereye)(texid_t tex, vec4_t fovoverride, vec3
 			res = xrWaitSwapchainImage(xr.eye[u].swapchain, &waitinfo);
 			if (XR_FAILED(res))
 				Con_Printf("xrWaitSwapchainImage: %s\n", XR_StringForResult(res));
-			rendereye(&xr.eye[u].swapimages[imgidx], fovoverride, orientation);
+			rendereye(&xr.eye[u].swapimages[imgidx], NULL, fovoverride, NULL/*we're given fov info instead*/, eyematrix);
 			//GL note: the OpenXR specification says NOTHING about the application having to glFlush or glFinish.
 			//	I take this to mean that the openxr runtime is responsible for setting up barriers or w/e inside ReleaseSwapchainImage.
 			//VK note: the OpenXR spec does say that it needs to be color_attachment_optimal+owned by queue. which it is.
diff --git a/plugins/plugin.h b/plugins/plugin.h
index bfb7d71fb..8af8cc2cb 100644
--- a/plugins/plugin.h
+++ b/plugins/plugin.h
@@ -603,6 +603,8 @@ extern plugcorefuncs_t *plugfuncs;
 extern plugcmdfuncs_t *cmdfuncs;
 extern plugcvarfuncs_t *cvarfuncs;
 
+#define Q_snprintf (void)Q_snprintfz
+#define Q_vsnprintf (void)Q_vsnprintfz
 #ifdef FTEENGINE
 extern plugcorefuncs_t plugcorefuncs;
 #else
@@ -612,8 +614,6 @@ void Q_strlcat(char *d, const char *s, int n);
 
 qboolean VARGS Q_vsnprintfz (char *dest, size_t size, const char *fmt, va_list argptr);
 qboolean VARGS Q_snprintfz (char *dest, size_t size, const char *fmt, ...) LIKEPRINTF(3);
-#define Q_snprintf (void)Q_snprintfz
-#define Q_vsnprintf (void)Q_vsnprintfz
 
 char	*va(const char *format, ...);
 qboolean Plug_Init(void);
diff --git a/plugins/quake3/clq3_parse.c b/plugins/quake3/clq3_parse.c
index 7d8f70c93..ae4fdb988 100644
--- a/plugins/quake3/clq3_parse.c
+++ b/plugins/quake3/clq3_parse.c
@@ -1021,7 +1021,7 @@ void CLQ3_SendConnectPacket(struct ftenet_connections_s *socket, netadr_t *to, i
 	memset(&ccs, 0, sizeof(ccs));
 	ccs.servercount = -1;
 	ccs.challenge = challenge;
-	Netchan_SetupQ3(NS_CLIENT, &ccs.netchan, to, qport);
+	Netchan_SetupQ3(NCF_CLIENT, &ccs.netchan, to, qport);
 
 	worldfuncs->IBufToInfo(userinfo, infostr, sizeof(infostr), priorityq3, nonq3, NULL, NULL,/*&cls.userinfosync,*/ userinfo);
 
diff --git a/plugins/quake3/clq3defs.h b/plugins/quake3/clq3defs.h
index 4337b466c..9f40b3c70 100644
--- a/plugins/quake3/clq3defs.h
+++ b/plugins/quake3/clq3defs.h
@@ -360,7 +360,7 @@ typedef struct {
 } q3glconfig_t;
 
 
-void Netchan_SetupQ3(netsrc_t sock, netchan_t *chan, netadr_t *adr, int qport);
+void Netchan_SetupQ3(unsigned int flags, netchan_t *chan, netadr_t *adr, int qport);
 void Netchan_TransmitNextFragment(struct ftenet_connections_s *socket, netchan_t *chan);
 void Netchan_TransmitQ3(struct ftenet_connections_s *socket, netchan_t *chan, int length, const qbyte *data);
 qboolean Netchan_ProcessQ3 (netchan_t *chan, sizebuf_t *msg);
diff --git a/plugins/quake3/q3common.c b/plugins/quake3/q3common.c
index ec3e6c0cf..fcb570d20 100644
--- a/plugins/quake3/q3common.c
+++ b/plugins/quake3/q3common.c
@@ -422,11 +422,11 @@ int VMQ3_Cvar_Update(q3vmcvar_t *v)
 #define STUNDEMULTIPLEX_MASK	0x40000000	//stun requires that we set this bit to avoid surprises, and ignore packets without it.
 #define FRAGMENT_MASK			0x80000000
 #define FRAGMENTATION_TRESHOLD	(MAX_PACKETLEN-100)
-void Netchan_SetupQ3(netsrc_t sock, netchan_t *chan, netadr_t *adr, int qport)
+void Netchan_SetupQ3(unsigned int flags, netchan_t *chan, netadr_t *adr, int qport)
 {
 	memset (chan, 0, sizeof(*chan));
 
-	chan->sock = sock;
+	chan->flags = flags;
 	chan->remote_address = *adr;
 	chan->last_received = realtime;
 	chan->incoming_unreliable = -1;
@@ -452,7 +452,7 @@ qboolean Netchan_ProcessQ3 (netchan_t *chan, sizebuf_t *msg)
 	msgfuncs->BeginReading(msg, msg_nullnetprim);
 	sequence = msgfuncs->ReadBits(32);
 
-	if (chan->pext_stunaware)
+	if (chan->flags & NCF_STUNAWARE)
 	{
 		sequence = ((sequence&0xff000000)>>24)|((sequence&0x00ff0000)>>8)|((sequence&0x0000ff00)<<8)|((sequence&0x000000ff)<<24);	//reinterpret it as big-endian
 		if (sequence & STUNDEMULTIPLEX_MASK)
@@ -462,7 +462,7 @@ qboolean Netchan_ProcessQ3 (netchan_t *chan, sizebuf_t *msg)
 	}
 
 	// Read the qport if we are a server
-	if (chan->sock == NS_SERVER)
+	if (!(chan->flags&NCF_CLIENT))
 	{
 		msgfuncs->ReadBits(16);
 	}
@@ -592,13 +592,12 @@ void Netchan_TransmitNextFragment(struct ftenet_connections_s *socket, netchan_t
 {
 	//'reliable' is badly named. it should be 'fragment' instead.
 	//but in the interests of a smaller netchan_t...
-	int i;
 	sizebuf_t	send;
 	qbyte		send_buf[MAX_PACKETLEN];
 	int			fragmentLength;
 
 	int sequence = chan->outgoing_sequence | FRAGMENT_MASK;
-	if (chan->pext_stunaware)
+	if (chan->flags&NCF_STUNAWARE)
 	{
 		sequence+= STUNDEMULTIPLEX_MASK;
 		sequence = ((sequence&0xff000000)>>24)|((sequence&0x00ff0000)>>8)|((sequence&0x0000ff00)<<8)|((sequence&0x000000ff)<<24);	//reinterpret it as big-endian
@@ -612,7 +611,7 @@ void Netchan_TransmitNextFragment(struct ftenet_connections_s *socket, netchan_t
 	msgfuncs->WriteLong( &send, sequence );
 #ifndef SERVERONLY
 	// Send the qport if we are a client
-	if( chan->sock == NS_CLIENT )
+	if (chan->flags&NCF_CLIENT)
 	{
 		msgfuncs->WriteShort( &send, chan->qport);
 	}
@@ -649,9 +648,9 @@ void Netchan_TransmitNextFragment(struct ftenet_connections_s *socket, netchan_t
 		chan->reliable_length = 0;
 		chan->reliable_start = 0;
 
-		i = chan->outgoing_sequence & (MAX_LATENT-1);
-		chan->outgoing_size[i] = send.cursize;
-		chan->outgoing_time[i] = realtime;
+//		i = chan->outgoing_sequence & (MAX_LATENT-1);
+//		chan->outgoing_size[i] = send.cursize;
+//		chan->outgoing_time[i] = realtime;
 	}
 }
 
@@ -662,7 +661,6 @@ Netchan_Transmit
 */
 void Netchan_TransmitQ3(struct ftenet_connections_s *socket, netchan_t *chan, int length, const qbyte *data )
 {
-	int i;
 	sizebuf_t	send;
 	qbyte		send_buf[MAX_OVERALLMSGLEN+6];
 	char		adr[MAX_ADR_SIZE];
@@ -705,7 +703,7 @@ void Netchan_TransmitQ3(struct ftenet_connections_s *socket, netchan_t *chan, in
 	}
 
 	sequence = chan->outgoing_sequence;
-	if (chan->pext_stunaware)
+	if (chan->flags & NCF_STUNAWARE)
 	{
 		sequence+= STUNDEMULTIPLEX_MASK;
 		sequence = ((sequence&0xff000000)>>24)|((sequence&0x00ff0000)>>8)|((sequence&0x0000ff00)<<8)|((sequence&0x000000ff)<<24);	//reinterpret it as big-endian
@@ -716,10 +714,8 @@ void Netchan_TransmitQ3(struct ftenet_connections_s *socket, netchan_t *chan, in
 	msgfuncs->WriteLong(&send, chan->outgoing_sequence);
 #ifndef SERVERONLY
 	// Send the qport if we are a client
-	if( chan->sock == NS_CLIENT )
-	{
+	if (chan->flags == NCF_CLIENT)
 		msgfuncs->WriteShort(&send, chan->qport);
-	}
 #endif
 	// Copy the message to the packet
 	msgfuncs->WriteData(&send, data, length);
@@ -734,9 +730,9 @@ void Netchan_TransmitQ3(struct ftenet_connections_s *socket, netchan_t *chan, in
 */
 	chan->outgoing_sequence++;
 
-	i = chan->outgoing_sequence & (MAX_LATENT-1);
-	chan->outgoing_size[i] = send.cursize;
-	chan->outgoing_time[i] = realtime;
+//	i = chan->outgoing_sequence & (MAX_LATENT-1);
+//	chan->outgoing_size[i] = send.cursize;
+//	chan->outgoing_time[i] = realtime;
 }
 
 
diff --git a/plugins/quake3/svq3_game.c b/plugins/quake3/svq3_game.c
index 4e4cf2f8c..db9457dbb 100644
--- a/plugins/quake3/svq3_game.c
+++ b/plugins/quake3/svq3_game.c
@@ -3413,7 +3413,7 @@ void SVQ3_DirectConnect(netadr_t *from, sizebuf_t *msg)	//Actually connect the c
 	cl->name = cl->namebuf;
 	cl->team = cl->teambuf;
 	worldfuncs->ExtractFromUserinfo(cl, true);
-	Netchan_SetupQ3(NS_SERVER, &cl->netchan, from, qport);
+	Netchan_SetupQ3(NCF_SERVER, &cl->netchan, from, qport);
 	cl->netchan.outgoing_sequence = 1;
 
 	cl->challenge = challenge;
diff --git a/quakec/csaddon/src/csplat.qc b/quakec/csaddon/src/csplat.qc
index 479af35fa..0c986b9f7 100644
--- a/quakec/csaddon/src/csplat.qc
+++ b/quakec/csaddon/src/csplat.qc
@@ -730,7 +730,7 @@ void(string cmdtext) GameCommand;
 string(string uri, string method, string postdata, __in string requestheaders, __inout string responseheaders) Cef_GeneratePage;	/* Provides an entrypoint to generate pages for the CEF plugin from within QC. Headers are 
 -separated key/value pairs (use tokenizebyseparator). */
 #ifdef SSQC
-string(string uri, string method, string postdata, __in string requestheaders, __inout string responseheaders) HTTP_GeneratePage;	/* Provides an entrypoint to generate pages for pages requested over http (sv_port_tcp+net_enable_http). Headers are 
+string(string uri, string method, string postdata, __in string requestheaders, __inout string responseheaders) HTTP_GeneratePage;	/* Provides an entrypoint to generate pages for pages requested over http (sv_port_tcp+net_enable_http). Headers are 
 -separated key/value pairs (use tokenizebyseparator). Return __NULL__ to let the engine handle it, an empty string for a 404, and any other text for a regular 200 response. */
 #endif
 #if defined(CSQC) || defined(SSQC)
@@ -1595,7 +1595,7 @@ void() crash = #72; /*
 void() stackdump = #73; /*
 		Prints out the QC's stack, for console-based error reports. */
 
-searchhandle(string pattern, enumflags:float{SB_CASEINSENSITIVE=1<<0,SB_FULLPACKAGEPATH=1<<1,SB_ALLOWDUPES=1<<2,SB_FORCESEARCH=1<<3} flags, float quiet, optional string package) search_begin = #74; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE*/
+searchhandle(string pattern, enumflags:float{SB_CASEINSENSITIVE=1<<0,SB_FULLPACKAGEPATH=1<<1,SB_ALLOWDUPES=1<<2,SB_FORCESEARCH=1<<3,SB_MULTISEARCH=1<<4} flags, float quiet, optional string package) search_begin = #74; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE*/
 void(searchhandle handle) search_end = #75; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE*/
 float(searchhandle handle) search_getsize = #76; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE*/
 string(searchhandle handle, float num) search_getfilename = #77; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE*/
@@ -3122,7 +3122,7 @@ void(entity e, string s) clientcommand = #440; /* Part of KRIMZON_SV_PARSECLIENT
 float(string s) tokenize = #441; /* Part of KRIMZON_SV_PARSECLIENTCOMMAND*/
 string(float n) argv = #442; /* Part of KRIMZON_SV_PARSECLIENTCOMMAND*/
 void(entity e, entity tagentity, string tagname) setattachment = #443; /* Part of DP_GFX_QUAKE3MODELTAGS*/
-searchhandle(string pattern, enumflags:float{SB_CASEINSENSITIVE=1<<0,SB_FULLPACKAGEPATH=1<<1,SB_ALLOWDUPES=1<<2,SB_FORCESEARCH=1<<3} flags, float quiet, optional string filterpackage) search_begin = #444; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE
+searchhandle(string pattern, enumflags:float{SB_CASEINSENSITIVE=1<<0,SB_FULLPACKAGEPATH=1<<1,SB_ALLOWDUPES=1<<2,SB_FORCESEARCH=1<<3,SB_MULTISEARCH=1<<4} flags, float quiet, optional string filterpackage) search_begin = #444; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE
 		initiate a filesystem scan based upon filenames. Be sure to call search_end on the returned handle. SB_FULLPACKAGEPATH interprets the filterpackage arg as a full package path to avoid gamedir ambiguity, equivelent to whichpack's WP_FULLPACKAGEPATH flag. SB_ALLOWDUPES allows returning multiple entries with the same name (but different package, useful with search_fopen). SB_FORCESEARCH requires use of the filterpackage and SB_FULLPACKAGEPATH flag, initiating searches from gamedirs/packages which are not currently active. */
 
 void(searchhandle handle) search_end = #445; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE*/
diff --git a/quakec/csqctest/src/progs.src b/quakec/csqctest/src/progs.src
index 987e498af..e871b423a 100644
--- a/quakec/csqctest/src/progs.src
+++ b/quakec/csqctest/src/progs.src
@@ -1,2 +1,2 @@
 #pragma sourcefile csprogs.src
-#pragma sourcefile ssqc.src
\ No newline at end of file
+#pragma sourcefile ssqc.src
diff --git a/quakec/menusys/fteextensions.qc b/quakec/menusys/fteextensions.qc
index 008be45d7..bf63e16df 100644
--- a/quakec/menusys/fteextensions.qc
+++ b/quakec/menusys/fteextensions.qc
@@ -730,7 +730,7 @@ void(string cmdtext) GameCommand;
 string(string uri, string method, string postdata, __in string requestheaders, __inout string responseheaders) Cef_GeneratePage;	/* Provides an entrypoint to generate pages for the CEF plugin from within QC. Headers are 
 -separated key/value pairs (use tokenizebyseparator). */
 #ifdef SSQC
-string(string uri, string method, string postdata, __in string requestheaders, __inout string responseheaders) HTTP_GeneratePage;	/* Provides an entrypoint to generate pages for pages requested over http (sv_port_tcp+net_enable_http). Headers are 
+string(string uri, string method, string postdata, __in string requestheaders, __inout string responseheaders) HTTP_GeneratePage;	/* Provides an entrypoint to generate pages for pages requested over http (sv_port_tcp+net_enable_http). Headers are 
 -separated key/value pairs (use tokenizebyseparator). Return __NULL__ to let the engine handle it, an empty string for a 404, and any other text for a regular 200 response. */
 #endif
 #if defined(CSQC) || defined(SSQC)
@@ -1595,7 +1595,7 @@ void() crash = #72; /*
 void() stackdump = #73; /*
 		Prints out the QC's stack, for console-based error reports. */
 
-searchhandle(string pattern, enumflags:float{SB_CASEINSENSITIVE=1<<0,SB_FULLPACKAGEPATH=1<<1,SB_ALLOWDUPES=1<<2,SB_FORCESEARCH=1<<3} flags, float quiet, optional string package) search_begin = #74; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE*/
+searchhandle(string pattern, enumflags:float{SB_CASEINSENSITIVE=1<<0,SB_FULLPACKAGEPATH=1<<1,SB_ALLOWDUPES=1<<2,SB_FORCESEARCH=1<<3,SB_MULTISEARCH=1<<4} flags, float quiet, optional string package) search_begin = #74; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE*/
 void(searchhandle handle) search_end = #75; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE*/
 float(searchhandle handle) search_getsize = #76; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE*/
 string(searchhandle handle, float num) search_getfilename = #77; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE*/
@@ -2851,7 +2851,7 @@ void(float reverbslot, reverbinfo_t *reverbinfo, int sizeofreverinfo_t) setup_re
 		Reconfigures a reverb slot for weird effects. Slot 0 is reserved for no effects. Slot 1 is reserved for underwater effects. Reserved slots will be reinitialised on snd_restart, but can otherwise be changed. These reverb slots can be activated with SetListener. Note that reverb will currently only work when using OpenAL. */
 
 #endif
-void(string cmdname) registercommand = #352; /*
+void(string cmdname, optional string desc) registercommand = #352; /*
 		Register the given console command, for easy console use.
 		Console commands that are later used will invoke CSQC_ConsoleCommand/m_consolecommand/ConsoleCmd according to module. */
 
@@ -3121,7 +3121,7 @@ void(entity e, string s) clientcommand = #440; /* Part of KRIMZON_SV_PARSECLIENT
 float(string s) tokenize = #441; /* Part of KRIMZON_SV_PARSECLIENTCOMMAND*/
 string(float n) argv = #442; /* Part of KRIMZON_SV_PARSECLIENTCOMMAND*/
 void(entity e, entity tagentity, string tagname) setattachment = #443; /* Part of DP_GFX_QUAKE3MODELTAGS*/
-searchhandle(string pattern, enumflags:float{SB_CASEINSENSITIVE=1<<0,SB_FULLPACKAGEPATH=1<<1,SB_ALLOWDUPES=1<<2,SB_FORCESEARCH=1<<3} flags, float quiet, optional string filterpackage) search_begin = #444; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE
+searchhandle(string pattern, enumflags:float{SB_CASEINSENSITIVE=1<<0,SB_FULLPACKAGEPATH=1<<1,SB_ALLOWDUPES=1<<2,SB_FORCESEARCH=1<<3,SB_MULTISEARCH=1<<4} flags, float quiet, optional string filterpackage) search_begin = #444; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE
 		initiate a filesystem scan based upon filenames. Be sure to call search_end on the returned handle. SB_FULLPACKAGEPATH interprets the filterpackage arg as a full package path to avoid gamedir ambiguity, equivelent to whichpack's WP_FULLPACKAGEPATH flag. SB_ALLOWDUPES allows returning multiple entries with the same name (but different package, useful with search_fopen). SB_FORCESEARCH requires use of the filterpackage and SB_FULLPACKAGEPATH flag, initiating searches from gamedirs/packages which are not currently active. */
 
 void(searchhandle handle) search_end = #445; /* Part of DP_QC_FS_SEARCH, DP_QC_FS_SEARCH_PACKFILE*/
diff --git a/quakec/menusys/menu.src b/quakec/menusys/menu.src
index e2d9a09fb..d0c168a66 100644
--- a/quakec/menusys/menu.src
+++ b/quakec/menusys/menu.src
@@ -30,32 +30,32 @@ void(mitem_desktop desktop) M_Pop =
 //define the commands.
 //cmd argments are: Name, Function, Sourcefile(may be empty)
 #define concommandslist									\
-	cmd("m_main",		M_Main,			menu/main.qc)			\
-	cmd("m_pop",		M_Pop,			)				\
-	cmd("m_options",	M_Options,		menu/options.qc)		\
-	cmd("m_keys",		M_Options_Keys,		menu/options_keys.qc)		\
-	cmd("m_basicopts",	M_Options_Basic,	menu/options_basic.qc)		\
-	cmd("m_video",		M_Options_Video,	menu/options_video.qc)		\
-	cmd("m_effects",	M_Options_Effects,	menu/options_effects.qc)	\
-	cmd("m_audio",		M_Options_Audio,	menu/options_audio.qc)		\
-	cmd("m_particles",	M_Options_Particles,	menu/options_particles.qc)	\
-	cmd("m_hud",		M_Options_Hud,		menu/options_hud.qc)		\
-	cmd("m_load",		M_Load,			menu/loadsave.qc)		\
-	cmd("m_save",		M_Save,			)				\
-	cmd("m_quit",		M_Quit,			menu/quit.qc)			\
-	cmd("m_mods",		M_Menu_Mods,		menu/mods.qc)			\
-	cmd("m_updates",	M_Menu_Updates,		menu/updates.qc)		\
-	cmd("m_cvars",		M_Menu_Cvars,		menu/cvars.qc)			\
-	cmd("m_newgame",	M_NewGame,		menu/newgame.qc)		\
-	cmd("m_servers",	M_Servers,		menu/servers.qc)		\
-	cmd("m_configs",	M_Configs,		menu/options_configs.qc)	\
-	cmd("m_reset",		M_Reset,		)				\
-	cmd("m_dir",		M_Dir,		)				\
-	cmd("m_cat",		M_FOpen,		)				\
-	cmd("m_preset",		M_Preset,		menu/presets.qc)
+	cmd("m_main",		M_Main,					menu/main.qc,				"Main Menu")	\
+	cmd("m_pop",		M_Pop,					,							__NULL__)	\
+	cmd("m_options",	M_Options,				menu/options.qc,			__NULL__)	\
+	cmd("m_keys",		M_Options_Keys,			menu/options_keys.qc,		"Fix up the stupid default key bindings.")	\
+	cmd("m_basicopts",	M_Options_Basic,		menu/options_basic.qc,		"Change your public player settings, like name.")	\
+	cmd("m_video",		M_Options_Video,		menu/options_video.qc,		"Change video modes and devices.")	\
+	cmd("m_effects",	M_Options_Effects,		menu/options_effects.qc,	__NULL__)	\
+	cmd("m_audio",		M_Options_Audio,		menu/options_audio.qc,		"Tweak audio/voip devices+volumes+etc.")	\
+	cmd("m_particles",	M_Options_Particles,	menu/options_particles.qc,	__NULL__)	\
+	cmd("m_hud",		M_Options_Hud,			menu/options_hud.qc,		"Select which HUD layout to use")	\
+	cmd("m_load",		M_Load,					menu/loadsave.qc,			"Load a saved game")	\
+	cmd("m_save",		M_Save,					,							"Save the game for later, or for retconnoisseur purposes.")	\
+	cmd("m_quit",		M_Quit,					menu/quit.qc,				"Choose the cowards option")	\
+	cmd("m_mods",		M_Menu_Mods,			menu/mods.qc,				"Switch mod")	\
+	cmd("m_updates",	M_Menu_Updates,			menu/updates.qc,			__NULL__)	\
+	cmd("m_cvars",		M_Menu_Cvars,			menu/cvars.qc,				"Advanced confguration of all settings.")	\
+	cmd("m_newgame",	M_NewGame,				menu/newgame.qc,			"Start a new game!")	\
+	cmd("m_servers",	M_Servers,				menu/servers.qc,			"Join someone else's game")	\
+	cmd("m_configs",	M_Configs,				menu/options_configs.qc,	__NULL__)	\
+	cmd("m_reset",		M_Reset,				,							__NULL__)	\
+	cmd("m_dir",		M_Dir,					,							"Debug command to list data files (from qc's perspective).")	\
+	cmd("m_cat",		M_FOpen,				,							"Debug command to display the contents of data files (with qc's access rights).")	\
+	cmd("m_preset",		M_Preset,				menu/presets.qc,			__NULL__)
 	
 //make sure all the right files are included
-#define cmd(n,fnc,inc) inc
+#define cmd(n,fnc,inc,desc) inc
 #includelist
 	concommandslist
 #endlist
@@ -89,14 +89,14 @@ void(float mode) m_toggle
 	items_updategrabs(TRUE);
 };
 float(string cstr) m_consolecommand =
-{
+{	//for properly registered commands
 	tokenize_console(cstr);
 	string cmd = argv(0);
 
 	switch(cmd)
 	{
 //switch on the known commands.
-#define cmd(n,f) case n: f(desktop); break;
+#define cmd(n,f,inc,desc) case n: f(desktop); break;
 	concommandslist
 #undef cmd
 	default:
@@ -105,6 +105,24 @@ float(string cstr) m_consolecommand =
 	items_updategrabs(TRUE);
 	return TRUE;
 }
+void(string cstr) GameCommand =
+{	//'menu_cmd' hack for compat with DP, used via aliases and mess, instead of using the m_consolecommand entrypoint.
+	tokenize_console(cstr);
+	string cmd = argv(0);
+
+	switch(cmd)
+	{
+//switch on the known commands.
+#define cmd(n,f,inc,desc) case n: f(desktop); break;
+	concommandslist
+#undef cmd
+	default:
+		print("unknown command ", cmd, "\n");
+		return;
+	}
+	items_updategrabs(TRUE);
+};
+
 
 var float autocvar_dp_workarounds = FALSE;
 void() m_init =
@@ -115,14 +133,14 @@ void() m_init =
 
 	if (checkbuiltin(registercommand))
 	{
-#define cmd(n,f) registercommand(n);
+#define cmd(n,f,inc,desc) registercommand(n,desc);
 		concommandslist
 #undef cmd
 	}
 	else
 	{
-	//register the console commands via the alias command.
-#define cmd(n,f) localcmd("alias " n " \"menu_cmd " n " $*\"\n");
+		//register the console commands via the alias command. ugly.
+#define cmd(n,f,inc,desc) localcmd("alias " n " \"menu_cmd " n " $*\"\n");
 		concommandslist
 #undef cmd
 	}
@@ -144,21 +162,4 @@ void() m_init =
 	if (clientstate() == 1)	//disconnected==1, supposedly
 		m_toggle(1);
 };
-void(string cstr) GameCommand =
-{
-	tokenize_console(cstr);
-	string cmd = argv(0);
-
-	switch(cmd)
-	{
-//switch on the known commands.
-#define cmd(n,f) case n: f(desktop); break;
-	concommandslist
-#undef cmd
-	default:
-		print("unknown command ", cmd, "\n");
-		break;
-	}
-	items_updategrabs(TRUE);
-};
 
diff --git a/quakec/menusys/menu/main.qc b/quakec/menusys/menu/main.qc
index 34d006bbb..22f3b99f8 100644
--- a/quakec/menusys/menu/main.qc
+++ b/quakec/menusys/menu/main.qc
@@ -107,22 +107,27 @@ nonstatic void(mitem_desktop desktop) M_Main =
 //a macro, in a desperate attempt at readability
 #define menuitemtext_cladd16(m,t,c,y) m.addm(spawn(mitem_text, item_text:t, item_command:c, item_scale:16, item_flags:IF_CENTERALIGN), [0, y], [160, y+16])
 
-	if (clientstate() == 2)				{menuitemtext_cladd16(m, _("Return To Game"), 			"m_pop",			y); y += 16;}
-	if (clientstate() == 2)				{menuitemtext_cladd16(m, isserver?_("End Game"):_("Disconnect"),"m_pop;disconnect",	y); y += 16;}
-	if (isserver() != 1 && checkbuiltin2(gethostcacheindexforkey,ISMENUQC))	{menuitemtext_cladd16(m, _("Join Server"),			"m_pop;m_servers",	y); y += 16;}
-	if (checkcommand2("map", TRUE))					{menuitemtext_cladd16(m, _("New Game"),				"m_pop;m_newgame",	y); y += 16;}
-	if (checkcommand2("menu_demo", FALSE))				{menuitemtext_cladd16(m, _("Demos"),				"m_pop;menu_demo",	y); y += 16;}
-	if (checkcommand2("save", TRUE) && (isserver()||dp_workarounds))	{menuitemtext_cladd16(m, _("Save"),				"m_pop;m_save",		y); y += 16;}
-	if (checkcommand2("load", TRUE))					{menuitemtext_cladd16(m, _("Load"),				"m_pop;m_load",		y); y += 16;}
+	if (clientstate() == 2)								{menuitemtext_cladd16(m, isdemo()?_("Return To Demo"):_("Return To Game"),
+																								 			"m_pop",				y); y += 16;}
+	if (clientstate() == 2)								{menuitemtext_cladd16(m, isdemo()?_("End Demo"):(isserver?_("End Game"):_("Disconnect")),
+																											"m_pop;disconnect",		y); y += 16;}
+	if (isserver() != 1 && checkbuiltin2(gethostcacheindexforkey,ISMENUQC))	{menuitemtext_cladd16(m, _("Join Server"),
+																											"m_pop;m_servers",		y); y += 16;}
+	if (checkcommand2("map", TRUE))						{menuitemtext_cladd16(m, _("New Game"),				"m_pop;m_newgame",		y); y += 16;}
+	if (checkcommand2("menu_demo", FALSE))				{menuitemtext_cladd16(m, _("Demos"),				"m_pop;menu_demo",		y); y += 16;}
+	if (checkcommand2("save", TRUE) && (isserver()||dp_workarounds))	{menuitemtext_cladd16(m, _("Save"),	"m_pop;m_save",			y); y += 16;}
+	if (checkcommand2("load", TRUE))					{menuitemtext_cladd16(m, _("Load"),					"m_pop;m_load",			y); y += 16;}
 	if (checkcommand2("cef", FALSE))					{menuitemtext_cladd16(m, _("Browser"),				"m_pop;cef google.com",	y); y += 16;}
-	if (checkcommand2("xmpp", FALSE))					{menuitemtext_cladd16(m, _("Social"),				"m_pop;xmpp",		y); y += 16;}
-	if (checkcommand2("irc", FALSE))					{menuitemtext_cladd16(m, _("IRC"),				"m_pop;irc /info",	y); y += 16;}
-	/*if (checkbuiltin2(getpackagemanagerinfo,FALSE))			{menuitemtext_cladd16(m, _("Updates+Packages"),			"m_pop;m_updates",	y); y += 16;}
-	else*/ if (checkcommand2("menu_download", FALSE))			{menuitemtext_cladd16(m, _("Updates+Packages"),			"m_pop;menu_download",	y); y += 16;}
-	if (checkcommand2("qi", FALSE))					{menuitemtext_cladd16(m, _("Quake Injector"),			"m_pop;qi",		y); y += 16;}
-	if (checkbuiltin2(getgamedirinfo,TRUE))					{menuitemtext_cladd16(m, _("Mods"),				"m_pop;m_mods",		y); y += 16;}
-										{menuitemtext_cladd16(m, _("Options"),				"m_pop;m_options",	y); y += 16;}
-										{menuitemtext_cladd16(m, _("Quit"), 				"m_pop;m_quit",		y); y += 16;}
+	if (checkcommand2("xmpp", FALSE))					{menuitemtext_cladd16(m, _("Social"),				"m_pop;xmpp",			y); y += 16;}
+	if (checkcommand2("irc", FALSE))					{menuitemtext_cladd16(m, _("IRC"),					"m_pop;irc /info",		y); y += 16;}
+	/*if (checkbuiltin2(getpackagemanagerinfo,FALSE))	{menuitemtext_cladd16(m, _("Updates+Packages"),		"m_pop;m_updates",		y); y += 16;}
+	else*/ if (checkcommand2("menu_download", FALSE))	{menuitemtext_cladd16(m, _("Updates+Packages"),		"m_pop;menu_download",	y); y += 16;}
+	if (checkcommand2("qi", FALSE))						{menuitemtext_cladd16(m, _("Quake Injector"),		"m_pop;qi",				y); y += 16;}
+	if (checkbuiltin2(getgamedirinfo,TRUE))				{menuitemtext_cladd16(m, _("Mods"),					"m_pop;m_mods",			y); y += 16;}
+	if (checkcommand2("sys_openfile", FALSE))			{menuitemtext_cladd16(m, _("Open/Add External File"),"m_pop;sys_openfile",	y); y += 16;}	//opens a file chooser dialog in eg chromium.
+	if (checkcommand2("xr_toggle", FALSE))				{menuitemtext_cladd16(m, _("Toggle VR"),			"m_pop;xr_toggle",		y); y += 16;}	//for webxr support
+														{menuitemtext_cladd16(m, _("Options"),				"m_pop;m_options",		y); y += 16;}
+														{menuitemtext_cladd16(m, _("Quit"), 				"m_pop;m_quit",			y); y += 16;}
 
 	//spinny quad/pent, for the luls
 	local string it = (random()<0.9)?"progs/quaddama.mdl":"progs/invulner.mdl";
diff --git a/quakec/menusys/menu/newgame.qc b/quakec/menusys/menu/newgame.qc
index 524b86e90..6daf8e60c 100644
--- a/quakec/menusys/menu/newgame.qc
+++ b/quakec/menusys/menu/newgame.qc
@@ -64,16 +64,47 @@ nonstatic void(mitem_desktop desktop) M_FOpen =
 		print("fopen failure\n");
 };
 
+static string(string name) basemapname =
+{
+	if (!strncmp(name, "maps/", 5))
+		name = substring(name, 5, -1);
+	if (substring(name, -4, -1) == ".bsp")
+		name = substring(name, 0, -5);
+	return name;
+};
+static string(string name) enginemapname =
+{
+	float ofs = strstrofs(name, ":");
+	if (ofs<0)
+	{
+		if (!strncmp(name, "maps/", 5))
+			name = substring(name, 5, -1);
+		if (substring(name, -8, -1) == ".bsp.gz")
+			name = strcat(substring(name, 0, -9),"^8.gz");	//fiddle a little with its display
+		if (substring(name, -4, -1) == ".bsp")
+			name = substring(name, 0, -5);
+	}
+	else
+	{	//faff with the cullers to try to make it more readable.
+		name = sprintf("^8%s:^7%s", substring(name, 0, ofs), substring(name, ofs, -1));
+	}
+	return name;
+};
+
 #define FOURCC(a,b,c,d) ((int)(a)<<0i)|((int)(b)<<8i)|((int)(c)<<16i)|((int)(d)<<24i)
 static string(string name) getmapdesc =
 {
+	if (strstrofs(name, ":")>=0)
+	{	//FIXME: look up the package's title?
+		return strcat("^8", basemapname(name));
+	}
 	if (checkbuiltin(fread) && checkbuiltin(fseek) && checkbuiltin(memalloc) && checkbuiltin(memfree) && checkbuiltin(memgetval) && checkbuiltin(itof) && checkbuiltin(ftoi))
 	{	//we can do it, so do it.
 		filestream f = fopen(name, FILE_READ);
 		if (f < 0)
 			print(sprintf("Unable to read %s\n", name));
 		
-		name = substring(name, 5, -5);
+		name = basemapname(name);
 		if (f < 0)
 			return name;
 
@@ -156,7 +187,7 @@ class mitem_maplist : mitem_grid
 	void() mitem_maplist =
 	{
 		searchhandle searchtable;
-		searchtable = search_begin("maps/*.bsp", SB_FULLPACKAGEPATH, 0);
+		searchtable = search_begin("maps/*.bsp:maps/*.bsp.gz", SB_FULLPACKAGEPATH|SB_MULTISEARCH, 0);
 		float files = search_getsize(searchtable);
 		if (files && checkbuiltin(search_getpackagename))
 		{	//find which gamedir the first entry is in (highest-priority is first)
@@ -177,14 +208,30 @@ class mitem_maplist : mitem_grid
 		for (float count = 0; count < files; count++)
 		{
 			string n = search_getfilename(searchtable, count);
-			string shortname = substring(n, 5, -5);
-			if (!strncmp(shortname, "_", 1) || !strncmp(shortname, "b_", 2))
-				continue;	//don't add b_* names
-			bufstr_set(names, grid_numchildren, n);
-			grid_numchildren++;
+			if (!strncmp(n, "maps/_", 6) || !strncmp(n, "maps/b_", 7))
+				continue;	//don't add b_* names nor _*
+			bufstr_add(names, n, TRUE);
 		}
 		search_end(searchtable);
+
+		for (float pkg = 0; ; pkg++)
+		{
+			string n = getpackagemanagerinfo(pkg, GPMI_NAME);
+			if not(n)
+				break;	//end of list.
+			string maps = getpackagemanagerinfo(pkg, GPMI_MAPS);
+			if not(maps)
+				continue;	//none? not a mappack? don't waste time on the tokenizing.
+			float eq = strstrofs(n, "=");
+			if (eq >= 0)
+				n = substring(n, 0, eq);
+			float c = tokenize_console(maps);
+			for (float i = 0; i < c; i++)
+				bufstr_add(names, sprintf("%s:%s", n, argv(i)), TRUE);
+		}
+
 		buf_sort(names, 0, FALSE);	//make sure they're sorted now.
+		grid_numchildren = buf_getsize(names);
 		descs = buf_create();
 
 		item_resized();	//FIXME: is this needed?
@@ -206,7 +253,7 @@ class mitem_maplist : mitem_grid
 				bufstr_set(descs, idx, desc);
 			}
 		}
-		map = substring(map, 5, -5);
+		map = basemapname(map);
 
 		vector col = (map == get("map"))?[1.16, 0.54, 0.41]:'1 1 1';
 		if (item_flags & IF_MFOCUSED && idx == grid_mactive)
@@ -225,7 +272,7 @@ class mitem_maplist : mitem_grid
 		if ((scan == K_ENTER || scan == K_MOUSE1) && down)
 		{
 			string map = bufstr_get(names, idx);
-			map = substring(map, 5, -5);
+			map = enginemapname(map);
 			set("map", map);
 			return TRUE;
 		}
diff --git a/quakec/menusys/menu/options_effects.qc b/quakec/menusys/menu/options_effects.qc
index 42a1f76c0..3c1201729 100644
--- a/quakec/menusys/menu/options_effects.qc
+++ b/quakec/menusys/menu/options_effects.qc
@@ -1,7 +1,25 @@
+class options_effects : mitem_exmenu
+{
+//	virtual float(string key) isvalid = {};
+	virtual string(string key) get =
+	{
+		if (key == "r_replacemodels")
+			return super::get(key)!=""?"1":"0";	//make it a boolean
+		return super::get(key);
+	};
+	virtual void(string key, string newval) set =
+	{
+		if (key == "r_replacemodels")	//convert from boolean to some arbitrary list.
+			newval = stof(newval)?"iqm md5mesh md3":"";
+
+		super::set(key, newval);
+	};
+};
+
 nonstatic void(mitem_desktop desktop) M_Options_Effects =
 {
 	mitem_exmenu m;
-	m = spawn(mitem_exmenu, item_text:_("Effects Options"), item_flags:IF_SELECTABLE, item_command:"m_options");
+	m = spawn(options_effects, item_text:_("Effects Options"), item_flags:IF_SELECTABLE, item_command:"m_options");
 	desktop.add(m, RS_X_MIN_PARENT_MIN|RS_Y_MIN_PARENT_MIN | RS_X_MAX_PARENT_MAX|RS_Y_MAX_PARENT_MAX, '0 0', '0 0');
 	desktop.item_focuschange(m, IF_KFOCUSED);
 	m.totop();
@@ -36,7 +54,7 @@ nonstatic void(mitem_desktop desktop) M_Options_Effects =
 																			//"lln	\"Linear (Linear mips, Unsmooth)\" "
 																)),	fl, [0, pos], [0, 8]); pos += 8;
 
-	fr.add(menuitemcombo_spawn(_("Anistrophy"),		cv2("gl_texture_anisotropy"/*qs*/, "gl_texture_anisotropic_filtering"/*fte*/),				'280 8', _(
+	fr.add(menuitemcombo_spawn(_("Anistrophy"),		cv2("gl_texture_anisotropy"/*qs*/, "gl_texture_anisotropic_filtering"/*old fte*/),				'280 8', _(
 																			"0	\"Off\" "
 																			"2	\"2\" "
 																			"4	\"4\" "
@@ -44,32 +62,34 @@ nonstatic void(mitem_desktop desktop) M_Options_Effects =
 																			"16	\"16\" "
 																)),	fl, [0, pos], [0, 8]); pos += 8;
 
-	fr.add(menuitemcheck_spawn(_("Lightmaps Only"),		"r_lightmap", 				'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+	fr.add(menuitemcheck_spawn(_("Replacement Models"),		"r_replacemodels",			'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+	fr.add(menuitemcheck_spawn(_("Double-bright Models"),	"gl_overbright_models", 	'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+	fr.add(menuitemcheck_spawn(_("Lightmaps Only"),			"r_lightmap", 				'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
 	if (engine == E_QSS)
 	{
-		fr.add(menuitemcheck_spawn(_("Wireframe"),		"r_showtris", 				'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
-		fr.add(menuitemcheck_spawn(_("Simple DLights"),		"gl_flashblend", 				'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+		fr.add(menuitemcheck_spawn(_("Wireframe"),			"r_showtris", 				'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+		fr.add(menuitemcheck_spawn(_("Simple DLights"),		"gl_flashblend", 			'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
 
-		fr.add(menuitemslider_spawn(_("Stereo"),		"r_stereo",	'0 8 0.25',	'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+		fr.add(menuitemslider_spawn(_("Stereo"),			"r_stereo",	'0 8 0.25',		'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
 	}
 	else
 	{
-		fr.add(menuitemcheck_spawn(_("Wireframe"),		"r_wireframe", 				'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
-		fr.add(menuitemcheck_spawn(_("Bloom"),				"r_bloom", 				'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
-		fr.add(menuitemcheck_spawn(_("Simple Textures"),		"r_drawflat", 				'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
-		fr.add(menuitemcheck_spawn(_("Paletted Rendering"),		"r_softwarebanding", 			'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
-		fr.add(menuitemcheck_spawn(_("HDR"),				"r_hdr_irisadaptation", 		'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+		fr.add(menuitemcheck_spawn(_("Wireframe"),			"r_wireframe", 				'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+		fr.add(menuitemcheck_spawn(_("Bloom"),				"r_bloom",					'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+		fr.add(menuitemcheck_spawn(_("Simple Textures"),	"r_drawflat", 				'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+		fr.add(menuitemcheck_spawn(_("Paletted Rendering"),	"r_softwarebanding", 		'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+		fr.add(menuitemcheck_spawn(_("HDR"),				"r_hdr_irisadaptation", 	'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
 		fr.add(menuitemcheck_spawn(_("Coronas"),			"r_coronas", 				'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
-		fr.add(menuitemcheck_spawn(_("Relief Mapping"),			"r_glsl_offsetmapping", 		'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
-		fr.add(menuitemcheck_spawn(_("RT Dynamic Lights"),	"r_shadow_realtime_dlight", 		'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
-		fr.add(menuitemcheck_spawn(_("RT World Lighting"),	"r_shadow_realtime_world", 		'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+		fr.add(menuitemcheck_spawn(_("Relief Mapping"),		"r_glsl_offsetmapping", 	'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+		fr.add(menuitemcheck_spawn(_("RT Dynamic Lights"),	"r_shadow_realtime_dlight", '280 8'),	fl, [0, pos], [0, 8]); pos += 8;
+		fr.add(menuitemcheck_spawn(_("RT World Lighting"),	"r_shadow_realtime_world", 	'280 8'),	fl, [0, pos], [0, 8]); pos += 8;
 
-		fr.add(menuitemcombo_spawn(_("Water Effects"),			"r_waterstyle",				'280 8', _(
+		fr.add(menuitemcombo_spawn(_("Water Effects"),			"r_waterstyle",			'280 8', _(
 																			"1	\"Classic\" "
 																			"2	\"Ripples\" "
 																			"3	\"Reflections\" "
 																)),	fl, [0, pos], [0, 8]); pos += 8;
-		fr.add(menuitemcombo_spawn(_("View Projection"),		"r_projection",				'280 8', _(
+		fr.add(menuitemcombo_spawn(_("View Projection"),		"r_projection",			'280 8', _(
 																			"0	\"Standard\" "
 																			"1	\"Stereographic / Pannini\" "
 																			"2	\"Fish-Eye\" "
@@ -77,7 +97,7 @@ nonstatic void(mitem_desktop desktop) M_Options_Effects =
 																			"4	\"Lambert Azimuthal Equal-Area\" "
 																			"5	\"Equirectangular\" "
 																)),	fl, [0, pos], [0, 8]); pos += 8;
-		fr.add(menuitemcombo_spawn(_("View Projection Fov"),		"ffov",					'280 8', _(
+		fr.add(menuitemcombo_spawn(_("View Projection Fov"),		"ffov",				'280 8', _(
 																			"90	\"Normal\" "
 																			"180	\"180 degrees\" "
 																			"270	\"270 degrees\" "
diff --git a/quakec/menusys/menu/updates.qc b/quakec/menusys/menu/updates.qc
index 772e2d26e..1a159bf41 100644
--- a/quakec/menusys/menu/updates.qc
+++ b/quakec/menusys/menu/updates.qc
@@ -14,6 +14,8 @@ enum : int
 	GPMI_ACTION,		//desired state
 	GPMI_AVAILABLE,		//whether it may be downloaded or not.
 	GPMI_FILESIZE,		//whether it may be downloaded or not.
+	GPMI_GAMEDIR,		//whether it may be downloaded or not.
+	GPMI_MAPS,			//whether it may be downloaded or not.
 };
 
 class mitem_updategrid : mitem_grid
diff --git a/specs/bspx.txt b/specs/bspx.txt
index 97d5ee234..a79e1d466 100644
--- a/specs/bspx.txt
+++ b/specs/bspx.txt
@@ -56,6 +56,7 @@ This allows a bsp to contain both scaled surfaces and unscaled ones, without loo
 LMSTYLE:
 (applies to fte, qss)
 This replaces the four lightstyle indexes of each surface lump entry. Normally only makes sense when used in conjunction with LMSHIFT.
+Obsoleted by DECOUPLED_LM.
 
 LMSTYLE16:
 (applies to fte, qss)
@@ -124,6 +125,46 @@ struct
 } persurface[];
 This provides each surface in the bsp with info about its most appropriate(nearest) envmap. if the index is ~0u, then no envmap is specified.
 
+DECOUPLED_LM:
+struct
+{
+	uint16_t lmsize[2];		//made explicit. beware MAX_
+	uint32_t lmoffset;		//replacement offset for vanilla compat.
+	vec4_t lmvecs[2]; 		//lmcoord[] = dotproduct3(vertexcoord, lmvecs[])+lmvecs[][3]
+} persurface[];
+Replaces LMSHIFT and LMOFFSET, but _NOT_ LMSTYLE(16). Allows the lightmap to be oriented+scaled entirely independantly, reducing seams between surfaces.
+
+LIGHTGRID_OCTREE:
+vec3_t  step;
+ivec3_t size;
+vec3_t  mins;
+byte    numstyles;	//WARNING: misaligns the rest of the data
+uint32_t rootnode;
+uint32_t numnodes;
+struct
+{
+	uint32_t mid[3];
+	uint32_t child[8];	//((z>=mid[2])<<0) | ((y>=mid[1])<<1) | ((x>=mid[0])<<2)
+		#define LGNODE_LEAF (1u<<31)
+		#define LGNODE_MISSING (1u<<30)
+} lgnode[numnodes];
+uint32_t numleafs;
+blob
+{
+	ivec3_t mins;
+	ivec3_t size;
+	blob
+	{
+		byte stylecount;	//compression...
+		struct
+		{
+			byte stylenum; 	//which lightstyle to scale the rgb values by
+			byte rgb[3];	//the actual sample
+		} [stylecount];
+	} perpoint[size[0]*size[1]*size[2]];
+} lgleaf[numleafs];
+The nodes exists to provide support for sparse data, allowing solid unplayable areas of the map to be omitted entirely. Convert the sample position you want into an index, walk the tree until either missing or leaf. If leaf then index and add up the weighted rgb values. If missing or stylecount is 0xff then there's no data at that point. You should sample the 8 points around your target position and weight+blend them - with the missing values compensated for by increasing the weight of the other samples so that an object next to a wall does not become black/fullbright/ugly.
+Misalignment and leaf compression means it must be repacked at load time for efficient access (which is likely to mean stylecount gets clamped to 4). Does not support HDR nor 16bit styles.
 
 Other features:
 FTE supports mipmaps with all four offsets set to 0 as external textures. Such texture will ignore gl_load24bit, treating it as always enabled. This saves space and simplifies copyright ownership without resulting in untextured maps (when the textures are actually available, anyway).
diff --git a/specs/hosting.txt b/specs/hosting.txt
new file mode 100644
index 000000000..32bbe68ed
--- /dev/null
+++ b/specs/hosting.txt
@@ -0,0 +1,189 @@
+TL;DR:
+	Server: set `sv_public 1` for a public server. Otherwise don't. Make sure deathmatch or coop are set before switching to a suitable map. Or use the menus...
+	Client: Use the menus to find+connect...
+	If stuff fails, try and set net_mtu to 1200 or so.
+	The rest of this file is only interesting if you're doing weird extra stuff involving other clients, particuarly QE.
+	
+	
+sv_port [IP:]UDPPORT:
+	Sets the udp port number(s) a server listens on, space-separated list if you want to specify multiple. Explicit IPs can be used for systems that need separate sockets for each interface to work around routing issues. Where possible these should be configured to accept inbound connections (see the ICE/RTC stuff)...
+	See also: net_enable_dtls
+
+sv_port_tcp [IP:]TCPPROT:
+	Like sv_port, but for tcp connections.
+	Sets the tcp port number(s)
+	This is used for all tcp connections - be they tcp/tls, ws(s), http(s), qtv, etc.
+	See also: net_enable_tls
+
+sv_port_rtp /serverid:
+	Specifies a name for the server to be advertised under.
+	(This activates an outbound TCP connection)
+	Your clients can 'connect /serverid' to join your server via ICE/holepunching, if you're too lazy.
+	Must also have a udp port open.
+
+sv_public:
+	-1: don't accept new clients, don't respond to queries (but don't harm anyone already connected).
+	0: don't send heartbeats, can be discovered/queried just fine for lan games.
+	1: send heartbeats to the configured masters.
+	2: use rtp with an auto-generated name instead of sending heartbeats (if the master's servers are unusable anyway, why heartbeat).
+	
+setmaster:
+	This is deprecated in favour of net_[qw]master[extra]# cvars.
+	Its use will disable the built-in masters.
+	
+com_protocolname:
+	This cvar should be set via your mod's fmf file. It must match between client+server or the servers will be filtered out or otherwise warn/error about it.
+
+sv_playerslots:
+	Defaults to 32 in deathmatch or coop, or 1 otherwise (disabling networking in singleplayer), but can potentially be set all the way up to 255. Requires a map change to update (which may kick people)
+maxclients:
+	Prevents more than this many active players on the server. Can be changed mid-game.
+	
+	
+QW:
+	Regular quakeworld clients just need an open udp port to connect to. make sure your router has the port open.
+	quakeworld traditionally uses port 27500 but most hosts run multiple such servers so port numbers are basically always given anyway.
+	sv_listen:
+		0: ignore qw client connection requests (without preventing nq/dp/qe requests)
+		1: accept qw clients.
+	
+NQ:
+	NQ defaults to udp port 26000 instead of QW's port 27500.
+	sv_listen_nq:
+		0: doesn't accept nq clients
+		1: favour compat. blocks protocol extensions.
+		2: prevent possible denial of service attacks, but may misleadingly fail due to packetloss (just reconnect if it happens).
+		
+QE:
+	`connectqe IP:UDPPORT` can be used to connect a native fte client to a QE server. QE clients can also connect to FTE servers via its connect command (specify one of the udp ports, obviously).
+	For this to work properly, you MUST have a working dtls provider (read: windows users will need to find+enable the openssl plugin). Additionally you need to set up some PSK cvars correctly.
+	Required cvars:
+		set `dtls_psk_hint id-quake-ex-dtls`
+		set `dtls_psk_user id-quake-ex-dtls`
+		set `dtls_psk_key 7a55b980c49b9ae4d4ffdb3513c2e471d94b14c22077ed86`
+
+	Serverside:
+		set `net_enable_dtls 2` //or 3, if you want to force encryption on all connections.
+		the behaviour of `sv_listen_nq 2` is not required, as the client will have already passed dtls's challenge check so there's no need for a second.
+		
+	Clientside:
+		QE will not handle `connect dns:port` properly (ignoring the port bit). `connect ip:port` DOES work though.
+		Connecting an FTE server to a QE server can be done with FTE's `connectqe ip:port` command, which makes assumptions to match QE.
+		QE clients will generally block stuffcmds, so there may be some issues.
+		
+	Note that the playfab stuff does NOT work - although you can use FTE's RTC stuff as an equivelent, just that they're not mutually compatible.
+	(Use of QE's playfab auth keys results in charges to id for each usage and are thus all hidden and secret and C&D/DMCA-ey. while it would theoretically be possible to intercept these messages to determine the keys and then use FTE's webrtc support with the appropriate handshakes, its best not to go there)
+	
+DP:
+	Defaults to port 26000, same as regular NQ.
+	Serverside:
+		DP's protocols requires `sv_listen_dp 1` to be set on the fte server, otherwise it'll fall back to acting as a qw or nq client.
+		sv_bigcoords is required for dpp7, but note that doing so breaks compat with many other engines. Not using it will generally fall back to the bjp3 protocol when using sv_listen_dp.
+		packetloss may result dp clients randomly getting stuck with vanilla NQ protocols. You may wish to set sv_listen_nq to 0 to prevent this, again beware of triggering other compat issues.
+	Clientside:
+		Just use the connect command as normal.
+		
+Browser port:
+	The browser port can connect to servers hosting via ws:// and wss:// schemes. Be sure to specify port numbers when connecting (the TCP ones set via the server's sv_port_tcp).
+	Alternatively, the browser port is able to use webrtc via a broker (net_ice_broker). This allows the browser port to even host games, while also using udp instead of tcp; resulting in fewer stalls.
+	When told to connect to a plain IP :PORT address, the web port will convert that into a webrtc connection via the default broker (`/udp/ip:port`) - if the broker knows the server then it will relay your packets to the udp server in question so it doesn't need to open+forward any extra ports.
+	You will not be able to determine ping times before connecting, and dns lookups will not be performed, but the user's experience should otherwise be equivelent for public FTE servers. There's no relaying for servers (unless you want to provide TURN auth details), so it'll be as low latency as regular udp connections but will not work on legacy servers that lack support for the extra signalling.
+	
+	Browser Serverside:
+		You can host games via webrtc, compatible with both other browsers and native FTE clients. Other engines will not be able to connect.
+	Native Serverside:
+		If using ws:// then browsers will block connectivity when your site is hosted from an https:// scheme.
+		If using wss:// then your server MUST be using a certificate that the user's browser will accept. The browser does not inform about why the connection failed if its wrong. You may want to proxy ws(s)->ws via nginx/apache or whatever, but note that until X-Forwarded-For is supported this will mean you have to apply any IP-based bans in your wss proxy instead of in the game server.
+		WebRTC/broker stuff can work with self-signed certificates, but may have more MTU isues. You should not need to worry about proxying, just make sure that inbound udp will work properly and the webrtc stuff will also work.
+		Hosting on windows will require reliable (d)tls support (read: openssl plugin).
+
+Hexen2:
+	FTE is *NOT* network-compatible with any other hexen2 engines. Follow the QW guidelines when running a hexen2 server, as FTE just treats it as a glorified mod.
+	
+Q2:
+	Q2 clients are only supported when running Q2 gamecode. Connectivity cvars then use the same cvars for QW.
+	
+Q2E(playfab):
+	playfab is not supported. too many private crypto keys and ids with third-party charges for infrastructure upkeep.
+Q2E('lan'):
+	Unlike QE, dtls is not required.
+	Q2E defaults to udp port 5069
+	FTE does not implement a lobby system - only to a level as required for Q2E compat.
+	
+	Serverside, ensure udp port 5069 is open, and set net_enable_q2e:
+		0: q2e clients will be ignored.
+		1: q2e clients will be able to send requests to the udp port.
+
+	Clientside, use `connectq2e IP:PORT` to connect (assumes port 5069). They will not show in the server browser.
+
+Q3:
+	Q3 clients are only supported when running Q3 gamecode. Connectivity cvars then use the same cvars for QW.
+	Clientside, just use the connect command as normal (or the q3 ui's server browser stuff).
+
+Qizmo(tcp):
+	To connect to a qizmo or compatibleish quakeworld server over tcp instead of udp (eg because someone blocked UDP), use one of the following:
+		connecttcp ip:port
+		connect tcp://ip:port
+
+	Servers will need sv_port_tcp set, as well as net_enable_qizmo (which defaults to enabled anyway).
+
+(D)TLS:
+	net_enable_dtls:
+		0: don't allow it.
+		1: be prepared to use it when required for connectivity instead of failing outright.
+		2: use dtls whenever the peer is believed to support it. Due to the abundance of other quake engines that lack dtls, this is probably the mode you should be using.
+		3: use dtls. block connections that do not support it. The recommended setting, except for compatibility. Also blocks non-tls clients.
+	net_enable_tls:
+		0: drop inboumd connections that look like tls (blocking wss too).
+		1: allow tls.
+		
+	Windows warning:
+		On windows FTE uses microsoft's schannel tls+dtls system library. This library has numerous issues and even worse documentation.
+		Users should instead enable the openssh plugin. This will ensure tls+dtls actually work properly instead of being stuck with outdated cyphers and protocols that eg QE or the browser port will reject.
+
+	To connect to a server with a known fingerprint (eg to bypass other certificate checks, you can:
+		connect dtls://HOST:PORT/?fp=CERTIFICATEFINGERPRINT
+	The fingerprint can be obtained from serverinfo queries.
+	
+	Note: With dtls, the client provides security via certificate pinning rather than certificate signing (cert authorities tend not to sign certs for plain IPs, and we don't really have domain names for servers listed in server browsers).
+	You can add an ?fp=BASE64 after your server's port number to avoid fingerprint issues with your first-connection - or when sharing addresses (eg with qw:// uris).
+
+WS(S):
+	To connect to a websocket server, use a scheme like the following:
+		connect ws://HOST:PORT/
+		connect wss://HOST:PORT/
+	Omitting the port number is not recommended
+
+	Servers will need sv_port_tcp set. net_enable_websockets should also be set, but at least it defaults to on.
+	For wss support, the server will additionally need net_enable_tls with a suitable certificate.
+
+WebRTC / ICE:
+	ftemaster can act as a broker, set net_ice_broker to a different one if frag-net ever goes down.
+	The broker relays basic metadata between the client+server allowing them to punch a hole.
+	FTE's native implementation does not leak private IP addresses by default (nor will modern browsers).
+	If you wish to also hide your public address from the peer, set `net_ice_relayonly 1` and enable a TURN server.
+
+	TURN:
+		Used as part of ICE/webrtc, This is used as a fallback when direct connections fail.
+		FTE does not act as a TURN server at all, but does support TURN as a client via webrtc.
+		set `net_ice_servers` to something like `turn:yourhost:port?user=key?auth=value` (your ip will still be visible to both the broker+relay, but not to the server/client you're connecting with). Ideally use a turn server near you to keep latency down because this will normally harm your latency.
+		
+	ICE+WebRTC names are used somewhat interchangably in FTE. ICE is the part that establishes a connection while WebRTC says that its used in a way that web browsers find tollerable, so really the difference is that ICE has no sctp nor dtls requirement.
+
+QTV:
+	Clientside:
+		Use the qtvplay commands to connect from a client to a qtv server (the qtvlist command can be used to list streams available on a server).
+	
+	Serverside:
+		Set net_enable_qtv and sv_port_tcp.
+		You will likely want to set qtv_password to prevent people from connecting to the server itself.
+		You will also need to set qtv_maxstreams to something other than 0.
+		A server with these set will then allow qtv proxies (or unfortunately qtv clients) to connect directly to the server in order to stream to other clients.
+		FIXME: make this more intuitive.
+
+HTTP:
+	FTE servers can act as regular web servers. This is very basic compared to other servers, but can be used for downloads of mvds or other files.
+	You will need to set net_enable_http to use this, as well as a tcp port too obviously.
+	For https support, also set net_enable_tls.
+	Gamecode may generate pages/resources by implementing the HTTP_GeneratePage entrypoint in ssqc.
+	You can use the /demolist resource to view+download demos, otherwise resources effectively match those available
\ No newline at end of file